Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
685f0661
R
Rust
项目概览
int
/
Rust
接近 1 年 前同步成功
通知
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,发现更多精彩内容 >>
提交
685f0661
编写于
6月 14, 2020
作者:
A
Alexis Bourget
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add a new error type for the new method
上级
5f4eb27a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
98 addition
and
0 deletion
+98
-0
src/libstd/ffi/c_str.rs
src/libstd/ffi/c_str.rs
+96
-0
src/libstd/ffi/mod.rs
src/libstd/ffi/mod.rs
+2
-0
未找到文件。
src/libstd/ffi/c_str.rs
浏览文件 @
685f0661
...
@@ -260,6 +260,32 @@ pub struct FromBytesWithNulError {
...
@@ -260,6 +260,32 @@ pub struct FromBytesWithNulError {
kind
:
FromBytesWithNulErrorKind
,
kind
:
FromBytesWithNulErrorKind
,
}
}
/// An error indicating that a nul byte was not in the expected position.
///
/// The vector used to create a [`CString`] must have one and only one nul byte,
/// positioned at the end.
///
/// This error is created by the [`from_vec_with_nul`] method on [`CString`].
/// See its documentation for more.
///
/// [`CString`]: struct.CString.html
/// [`from_vec_with_nul`]: struct.CString.html#method.from_vec_with_nul
///
/// # Examples
///
/// ```
/// #![feature(cstring_from_vec_with_nul)]
/// use std::ffi::{CString, FromVecWithNulError};
///
/// let _: FromVecWithNulError = CString::from_vec_with_nul(b"f\0oo".to_vec()).unwrap_err();
/// ```
#[derive(Clone,
PartialEq,
Eq,
Debug)]
#[unstable(feature
=
"cstring_from_vec_with_nul"
,
issue
=
"73179"
)]
pub
struct
FromVecWithNulError
{
error_kind
:
FromBytesWithNulErrorKind
,
bytes
:
Vec
<
u8
>
,
}
#[derive(Clone,
PartialEq,
Eq,
Debug)]
#[derive(Clone,
PartialEq,
Eq,
Debug)]
enum
FromBytesWithNulErrorKind
{
enum
FromBytesWithNulErrorKind
{
InteriorNul
(
usize
),
InteriorNul
(
usize
),
...
@@ -275,6 +301,59 @@ fn not_nul_terminated() -> FromBytesWithNulError {
...
@@ -275,6 +301,59 @@ fn not_nul_terminated() -> FromBytesWithNulError {
}
}
}
}
#[unstable(feature
=
"cstring_from_vec_with_nul"
,
issue
=
"73179"
)]
impl
FromVecWithNulError
{
/// Returns a slice of [`u8`]s bytes that were attempted to convert to a [`CString`].
///
/// # Examples
///
/// Basic usage:
///
/// ```
/// #![feature(cstring_from_vec_with_nul)]
/// use std::ffi::CString;
///
/// // Some invalid bytes in a vector
/// let bytes = b"f\0oo".to_vec();
///
/// let value = CString::from_vec_with_nul(bytes.clone());
///
/// assert_eq!(&bytes[..], value.unwrap_err().as_bytes());
/// ```
///
/// [`CString`]: struct.CString.html
pub
fn
as_bytes
(
&
self
)
->
&
[
u8
]
{
&
self
.bytes
[
..
]
}
/// Returns the bytes that were attempted to convert to a [`CString`].
///
/// This method is carefully constructed to avoid allocation. It will
/// consume the error, moving out the bytes, so that a copy of the bytes
/// does not need to be made.
///
/// # Examples
///
/// Basic usage:
///
/// ```
/// #![feature(cstring_from_vec_with_nul)]
/// use std::ffi::CString;
///
/// // Some invalid bytes in a vector
/// let bytes = b"f\0oo".to_vec();
///
/// let value = CString::from_vec_with_nul(bytes.clone());
///
/// assert_eq!(bytes, value.unwrap_err().into_bytes());
/// ```
///
/// [`CString`]: struct.CString.html
pub
fn
into_bytes
(
self
)
->
Vec
<
u8
>
{
self
.bytes
}
}
/// An error indicating invalid UTF-8 when converting a [`CString`] into a [`String`].
/// An error indicating invalid UTF-8 when converting a [`CString`] into a [`String`].
///
///
/// `CString` is just a wrapper over a buffer of bytes with a nul
/// `CString` is just a wrapper over a buffer of bytes with a nul
...
@@ -1039,6 +1118,23 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
...
@@ -1039,6 +1118,23 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
}
}
}
}
#[unstable(feature
=
"cstring_from_vec_with_nul"
,
issue
=
"73179"
)]
impl
Error
for
FromVecWithNulError
{}
#[unstable(feature
=
"cstring_from_vec_with_nul"
,
issue
=
"73179"
)]
impl
fmt
::
Display
for
FromVecWithNulError
{
fn
fmt
(
&
self
,
f
:
&
mut
fmt
::
Formatter
<
'_
>
)
->
fmt
::
Result
{
match
self
.error_kind
{
FromBytesWithNulErrorKind
::
InteriorNul
(
pos
)
=>
{
write!
(
f
,
"data provided contains an interior nul byte at pos {}"
,
pos
)
}
FromBytesWithNulErrorKind
::
NotNulTerminated
=>
{
write!
(
f
,
"data provided is not nul terminated"
)
}
}
}
}
impl
IntoStringError
{
impl
IntoStringError
{
/// Consumes this error, returning original [`CString`] which generated the
/// Consumes this error, returning original [`CString`] which generated the
/// error.
/// error.
...
...
src/libstd/ffi/mod.rs
浏览文件 @
685f0661
...
@@ -157,6 +157,8 @@
...
@@ -157,6 +157,8 @@
#[stable(feature
=
"cstr_from_bytes"
,
since
=
"1.10.0"
)]
#[stable(feature
=
"cstr_from_bytes"
,
since
=
"1.10.0"
)]
pub
use
self
::
c_str
::
FromBytesWithNulError
;
pub
use
self
::
c_str
::
FromBytesWithNulError
;
#[unstable(feature
=
"cstring_from_vec_with_nul"
,
issue
=
"73179"
)]
pub
use
self
::
c_str
::
FromVecWithNulError
;
#[stable(feature
=
"rust1"
,
since
=
"1.0.0"
)]
#[stable(feature
=
"rust1"
,
since
=
"1.0.0"
)]
pub
use
self
::
c_str
::{
CStr
,
CString
,
IntoStringError
,
NulError
};
pub
use
self
::
c_str
::{
CStr
,
CString
,
IntoStringError
,
NulError
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录