bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Stabilize byte_slice_trim_ascii for &[u8]/&str

Browse source 
Remove feature from documentation examples
Add rustc_const_stable attribute to stabilized functions
Update intra-doc link for `u8::is_ascii_whitespace` on `&[u8]` functions
This commit is contained in:
okaneco 2024-02-07 11:19:01 -05:00
parent 6f7e00a3e6
commit 9fb49faf40
2 changed files with 15 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

21
library/core/src/slice/ascii.rs
View file

@ -114,18 +114,17 @@ impl [u8] {
/// Returns a byte slice with leading ASCII whitespace bytes removed. /// Returns a byte slice with leading ASCII whitespace bytes removed.
/// ///
/// 'Whitespace' refers to the definition used by /// 'Whitespace' refers to the definition used by
/// `u8::is_ascii_whitespace`. /// [`u8::is_ascii_whitespace`].
/// ///
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// #![feature(byte_slice_trim_ascii)]
///
/// assert_eq!(b" \t hello world\n".trim_ascii_start(), b"hello world\n"); /// assert_eq!(b" \t hello world\n".trim_ascii_start(), b"hello world\n");
/// assert_eq!(b" ".trim_ascii_start(), b""); /// assert_eq!(b" ".trim_ascii_start(), b"");
/// assert_eq!(b"".trim_ascii_start(), b""); /// assert_eq!(b"".trim_ascii_start(), b"");
/// ``` /// ```
#[unstable(feature = "byte_slice_trim_ascii", issue = "94035")] #[stable(feature = "byte_slice_trim_ascii", since = "CURRENT_RUSTC_VERSION")]
#[rustc_const_stable(feature = "byte_slice_trim_ascii", since = "CURRENT_RUSTC_VERSION")]
#[inline] #[inline]
pub const fn trim_ascii_start(&self) -> &[u8] { pub const fn trim_ascii_start(&self) -> &[u8] {
let mut bytes = self; let mut bytes = self;
@ -144,18 +143,17 @@ impl [u8] {
/// Returns a byte slice with trailing ASCII whitespace bytes removed. /// Returns a byte slice with trailing ASCII whitespace bytes removed.
/// ///
/// 'Whitespace' refers to the definition used by /// 'Whitespace' refers to the definition used by
/// `u8::is_ascii_whitespace`. /// [`u8::is_ascii_whitespace`].
/// ///
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// #![feature(byte_slice_trim_ascii)]
///
/// assert_eq!(b"\r hello world\n ".trim_ascii_end(), b"\r hello world"); /// assert_eq!(b"\r hello world\n ".trim_ascii_end(), b"\r hello world");
/// assert_eq!(b" ".trim_ascii_end(), b""); /// assert_eq!(b" ".trim_ascii_end(), b"");
/// assert_eq!(b"".trim_ascii_end(), b""); /// assert_eq!(b"".trim_ascii_end(), b"");
/// ``` /// ```
#[unstable(feature = "byte_slice_trim_ascii", issue = "94035")] #[stable(feature = "byte_slice_trim_ascii", since = "CURRENT_RUSTC_VERSION")]
#[rustc_const_stable(feature = "byte_slice_trim_ascii", since = "CURRENT_RUSTC_VERSION")]
#[inline] #[inline]
pub const fn trim_ascii_end(&self) -> &[u8] { pub const fn trim_ascii_end(&self) -> &[u8] {
let mut bytes = self; let mut bytes = self;
@ -175,18 +173,17 @@ impl [u8] {
/// removed. /// removed.
/// ///
/// 'Whitespace' refers to the definition used by /// 'Whitespace' refers to the definition used by
/// `u8::is_ascii_whitespace`. /// [`u8::is_ascii_whitespace`].
/// ///
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// #![feature(byte_slice_trim_ascii)]
///
/// assert_eq!(b"\r hello world\n ".trim_ascii(), b"hello world"); /// assert_eq!(b"\r hello world\n ".trim_ascii(), b"hello world");
/// assert_eq!(b" ".trim_ascii(), b""); /// assert_eq!(b" ".trim_ascii(), b"");
/// assert_eq!(b"".trim_ascii(), b""); /// assert_eq!(b"".trim_ascii(), b"");
/// ``` /// ```
#[unstable(feature = "byte_slice_trim_ascii", issue = "94035")] #[stable(feature = "byte_slice_trim_ascii", since = "CURRENT_RUSTC_VERSION")]
#[rustc_const_stable(feature = "byte_slice_trim_ascii", since = "CURRENT_RUSTC_VERSION")]
#[inline] #[inline]
pub const fn trim_ascii(&self) -> &[u8] { pub const fn trim_ascii(&self) -> &[u8] {
self.trim_ascii_start().trim_ascii_end() self.trim_ascii_start().trim_ascii_end()

15
library/core/src/str/mod.rs
View file

@ -2531,15 +2531,14 @@ impl str {
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// #![feature(byte_slice_trim_ascii)]
///
/// assert_eq!(" \t \u{3000}hello world\n".trim_ascii_start(), "\u{3000}hello world\n"); /// assert_eq!(" \t \u{3000}hello world\n".trim_ascii_start(), "\u{3000}hello world\n");
/// assert_eq!(" ".trim_ascii_start(), ""); /// assert_eq!(" ".trim_ascii_start(), "");
/// assert_eq!("".trim_ascii_start(), ""); /// assert_eq!("".trim_ascii_start(), "");
/// ``` /// ```
#[unstable(feature = "byte_slice_trim_ascii", issue = "94035")]
#[must_use = "this returns the trimmed string as a new slice, \ #[must_use = "this returns the trimmed string as a new slice, \
without modifying the original"] without modifying the original"]
#[stable(feature = "byte_slice_trim_ascii", since = "CURRENT_RUSTC_VERSION")]
#[rustc_const_stable(feature = "byte_slice_trim_ascii", since = "CURRENT_RUSTC_VERSION")]
#[inline] #[inline]
pub const fn trim_ascii_start(&self) -> &str { pub const fn trim_ascii_start(&self) -> &str {
// SAFETY: Removing ASCII characters from a `&str` does not invalidate // SAFETY: Removing ASCII characters from a `&str` does not invalidate
@ -2557,15 +2556,14 @@ impl str {
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// #![feature(byte_slice_trim_ascii)]
///
/// assert_eq!("\r hello world\u{3000}\n ".trim_ascii_end(), "\r hello world\u{3000}"); /// assert_eq!("\r hello world\u{3000}\n ".trim_ascii_end(), "\r hello world\u{3000}");
/// assert_eq!(" ".trim_ascii_end(), ""); /// assert_eq!(" ".trim_ascii_end(), "");
/// assert_eq!("".trim_ascii_end(), ""); /// assert_eq!("".trim_ascii_end(), "");
/// ``` /// ```
#[unstable(feature = "byte_slice_trim_ascii", issue = "94035")]
#[must_use = "this returns the trimmed string as a new slice, \ #[must_use = "this returns the trimmed string as a new slice, \
without modifying the original"] without modifying the original"]
#[stable(feature = "byte_slice_trim_ascii", since = "CURRENT_RUSTC_VERSION")]
#[rustc_const_stable(feature = "byte_slice_trim_ascii", since = "CURRENT_RUSTC_VERSION")]
#[inline] #[inline]
pub const fn trim_ascii_end(&self) -> &str { pub const fn trim_ascii_end(&self) -> &str {
// SAFETY: Removing ASCII characters from a `&str` does not invalidate // SAFETY: Removing ASCII characters from a `&str` does not invalidate
@ -2584,15 +2582,14 @@ impl str {
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// #![feature(byte_slice_trim_ascii)]
///
/// assert_eq!("\r hello world\n ".trim_ascii(), "hello world"); /// assert_eq!("\r hello world\n ".trim_ascii(), "hello world");
/// assert_eq!(" ".trim_ascii(), ""); /// assert_eq!(" ".trim_ascii(), "");
/// assert_eq!("".trim_ascii(), ""); /// assert_eq!("".trim_ascii(), "");
/// ``` /// ```
#[unstable(feature = "byte_slice_trim_ascii", issue = "94035")]
#[must_use = "this returns the trimmed string as a new slice, \ #[must_use = "this returns the trimmed string as a new slice, \
without modifying the original"] without modifying the original"]
#[stable(feature = "byte_slice_trim_ascii", since = "CURRENT_RUSTC_VERSION")]
#[rustc_const_stable(feature = "byte_slice_trim_ascii", since = "CURRENT_RUSTC_VERSION")]
#[inline] #[inline]
pub const fn trim_ascii(&self) -> &str { pub const fn trim_ascii(&self) -> &str {
// SAFETY: Removing ASCII characters from a `&str` does not invalidate // SAFETY: Removing ASCII characters from a `&str` does not invalidate