Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
47cc5cca
R
Rust
项目概览
int
/
Rust
11 个月 前同步成功
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
Rust
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
47cc5cca
编写于
6月 14, 2020
作者:
A
Alexis Bourget
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update to use the new error type and correctly compile the doc tests
上级
685f0661
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
21 addition
and
16 deletion
+21
-16
src/libstd/ffi/c_str.rs
src/libstd/ffi/c_str.rs
+21
-16
未找到文件。
src/libstd/ffi/c_str.rs
浏览文件 @
47cc5cca
...
...
@@ -234,18 +234,14 @@ pub struct CStr {
/// An error indicating that a nul byte was not in the expected position.
///
/// The slice used to create a [`CStr`]
or the vector used to create a
///
[`CString`] must have one and only one nul byte,
positioned at the end.
/// The slice used to create a [`CStr`]
must have one and only one nul byte,
/// positioned at the end.
///
/// This error is created by the
/// [`from_bytes_with_nul`][`CStr::from_bytes_with_nul`] method on
/// [`CStr`] or the [`from_vec_with_nul`][`CString::from_vec_with_nul`] method
/// on [`CString`]. See their documentation for more.
/// This error is created by the [`from_bytes_with_nul`] method on [`CStr`].
/// See its documentation for more.
///
/// [`CStr`]: struct.CStr.html
/// [`CStr::from_bytes_with_nul`]: struct.CStr.html#method.from_bytes_with_nul
/// [`CString`]: struct.CString.html
/// [`CString::from_vec_with_nul`]: struct.CString.html#method.from_vec_with_nul
/// [`from_bytes_with_nul`]: struct.CStr.html#method.from_bytes_with_nul
///
/// # Examples
///
...
...
@@ -726,6 +722,7 @@ fn into_inner(self) -> Box<[u8]> {
/// # Example
///
/// ```
/// #![feature(cstring_from_vec_with_nul)]
/// use std::ffi::CString;
/// assert_eq!(
/// unsafe { CString::from_vec_with_nul_unchecked(b"abc\0".to_vec()) },
...
...
@@ -753,27 +750,29 @@ pub unsafe fn from_vec_with_nul_unchecked(v: Vec<u8>) -> Self {
/// called without the ending nul byte.
///
/// ```
/// #![feature(cstring_from_vec_with_nul)]
/// use std::ffi::CString;
/// assert_eq!(
/// CString::from_vec_with_nul(b"abc\0".to_vec())
/// .expect("CString::from_vec_with_nul failed"),
/// CString::new(b"abc".to_vec())
/// CString::new(b"abc".to_vec())
.expect("CString::new failed")
/// );
/// ```
///
/// A incorrectly formatted vector will produce an error.
///
/// ```
/// use std::ffi::{CString, FromBytesWithNulError};
/// #![feature(cstring_from_vec_with_nul)]
/// use std::ffi::{CString, FromVecWithNulError};
/// // Interior nul byte
/// let _: From
Bytes
WithNulError = CString::from_vec_with_nul(b"a\0bc".to_vec()).unwrap_err();
/// let _: From
Vec
WithNulError = CString::from_vec_with_nul(b"a\0bc".to_vec()).unwrap_err();
/// // No nul byte
/// let _: From
Bytes
WithNulError = CString::from_vec_with_nul(b"abc".to_vec()).unwrap_err();
/// let _: From
Vec
WithNulError = CString::from_vec_with_nul(b"abc".to_vec()).unwrap_err();
/// ```
///
/// [`new`]: #method.new
#[unstable(feature
=
"cstring_from_vec_with_nul"
,
issue
=
"73179"
)]
pub
fn
from_vec_with_nul
(
v
:
Vec
<
u8
>
)
->
Result
<
Self
,
From
Bytes
WithNulError
>
{
pub
fn
from_vec_with_nul
(
v
:
Vec
<
u8
>
)
->
Result
<
Self
,
From
Vec
WithNulError
>
{
let
nul_pos
=
memchr
::
memchr
(
0
,
&
v
);
match
nul_pos
{
Some
(
nul_pos
)
if
nul_pos
+
1
==
v
.len
()
=>
{
...
...
@@ -781,8 +780,14 @@ pub fn from_vec_with_nul(v: Vec<u8>) -> Result<Self, FromBytesWithNulError> {
// of the vec.
Ok
(
unsafe
{
Self
::
from_vec_with_nul_unchecked
(
v
)
})
}
Some
(
nul_pos
)
=>
Err
(
FromBytesWithNulError
::
interior_nul
(
nul_pos
)),
None
=>
Err
(
FromBytesWithNulError
::
not_nul_terminated
()),
Some
(
nul_pos
)
=>
Err
(
FromVecWithNulError
{
error_kind
:
FromBytesWithNulErrorKind
::
InteriorNul
(
nul_pos
),
bytes
:
v
,
}),
None
=>
Err
(
FromVecWithNulError
{
error_kind
:
FromBytesWithNulErrorKind
::
NotNulTerminated
,
bytes
:
v
,
}),
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录