bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Stabilize feature 'cstr_from_bytes_until_nul'

Browse source
This commit is contained in:
Trevor Gross 2023-01-28 17:06:30 -05:00
parent ad8e1dc286
commit 83b05ef0ee
5 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
library/alloc/src/lib.rs
View file

@ -116,7 +116,6 @@
#![feature(const_eval_select)] #![feature(const_eval_select)]
#![feature(const_pin)] #![feature(const_pin)]
#![feature(const_waker)] #![feature(const_waker)]
#![feature(cstr_from_bytes_until_nul)]
#![feature(dispatch_from_dyn)] #![feature(dispatch_from_dyn)]
#![feature(error_generic_member_access)] #![feature(error_generic_member_access)]
#![feature(error_in_core)] #![feature(error_in_core)]

2
library/core/src/error.rs
View file

@ -505,7 +505,7 @@ impl Error for crate::ffi::FromBytesWithNulError {
} }
} }
#[unstable(feature = "cstr_from_bytes_until_nul", issue = "95027")] #[stable(feature = "cstr_from_bytes_until_nul", since = "CURRENT_RUSTC_VERSION")]
impl Error for crate::ffi::FromBytesUntilNulError {} impl Error for crate::ffi::FromBytesUntilNulError {}
#[unstable(feature = "get_many_mut", issue = "104642")] #[unstable(feature = "get_many_mut", issue = "104642")]

10
library/core/src/ffi/c_str.rs
View file

@ -150,10 +150,10 @@ impl FromBytesWithNulError {
/// This error is created by the [`CStr::from_bytes_until_nul`] method. /// This error is created by the [`CStr::from_bytes_until_nul`] method.
/// ///
#[derive(Clone, PartialEq, Eq, Debug)] #[derive(Clone, PartialEq, Eq, Debug)]
#[unstable(feature = "cstr_from_bytes_until_nul", issue = "95027")] #[stable(feature = "cstr_from_bytes_until_nul", since = "CURRENT_RUSTC_VERSION")]
pub struct FromBytesUntilNulError(()); pub struct FromBytesUntilNulError(());
#[unstable(feature = "cstr_from_bytes_until_nul", issue = "95027")] #[stable(feature = "cstr_from_bytes_until_nul", since = "CURRENT_RUSTC_VERSION")]
impl fmt::Display for FromBytesUntilNulError { impl fmt::Display for FromBytesUntilNulError {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "data provided does not contain a nul") write!(f, "data provided does not contain a nul")
@ -306,8 +306,6 @@ impl CStr {
/// ///
/// # Examples /// # Examples
/// ``` /// ```
/// #![feature(cstr_from_bytes_until_nul)]
///
/// use std::ffi::CStr; /// use std::ffi::CStr;
/// ///
/// let mut buffer = [0u8; 16]; /// let mut buffer = [0u8; 16];
@ -322,8 +320,8 @@ impl CStr {
/// assert_eq!(c_str.to_str().unwrap(), "AAAAAAAA"); /// assert_eq!(c_str.to_str().unwrap(), "AAAAAAAA");
/// ``` /// ```
/// ///
#[unstable(feature = "cstr_from_bytes_until_nul", issue = "95027")] #[stable(feature = "cstr_from_bytes_until_nul", since = "CURRENT_RUSTC_VERSION")]
#[rustc_const_unstable(feature = "cstr_from_bytes_until_nul", issue = "95027")] #[rustc_const_unstable(feature = "const_cstr_from_bytes_until_nul", issue = "95027")]
pub const fn from_bytes_until_nul(bytes: &[u8]) -> Result<&CStr, FromBytesUntilNulError> { pub const fn from_bytes_until_nul(bytes: &[u8]) -> Result<&CStr, FromBytesUntilNulError> {
let nul_pos = memchr::memchr(0, bytes); let nul_pos = memchr::memchr(0, bytes);
match nul_pos { match nul_pos {

1
library/std/src/lib.rs
View file

@ -278,7 +278,6 @@
#![feature(char_error_internals)] #![feature(char_error_internals)]
#![feature(char_internals)] #![feature(char_internals)]
#![feature(core_intrinsics)] #![feature(core_intrinsics)]
#![feature(cstr_from_bytes_until_nul)]
#![feature(cstr_internals)] #![feature(cstr_internals)]
#![feature(duration_constants)] #![feature(duration_constants)]
#![feature(error_generic_member_access)] #![feature(error_generic_member_access)]

1
src/tools/miri/tests/pass-dep/shims/pthreads.rs
View file

@ -1,5 +1,4 @@
//@ignore-target-windows: No libc on Windows //@ignore-target-windows: No libc on Windows
#![feature(cstr_from_bytes_until_nul)]
use std::ffi::{CStr, CString}; use std::ffi::{CStr, CString};
use std::thread; use std::thread;