squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Auto merge of #58047 - SimonSapin:split_ascii_whitespace, r=Centril

Browse source 
Stabilize split_ascii_whitespace

Tracking issue FCP to merge: https://github.com/rust-lang/rust/issues/48656#issuecomment-442372750

Closes https://github.com/rust-lang/rust/issues/48656
This commit is contained in:
bors 2019-02-02 09:12:39 +00:00
commit 3e58dabc16
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/liballoc/lib.rs
View file

@ -98,7 +98,6 @@
#![feature(rustc_attrs)] #![feature(rustc_attrs)]
#![feature(receiver_trait)] #![feature(receiver_trait)]
#![feature(specialization)] #![feature(specialization)]
#![feature(split_ascii_whitespace)]
#![feature(staged_api)] #![feature(staged_api)]
#![feature(str_internals)] #![feature(str_internals)]
#![feature(trusted_len)] #![feature(trusted_len)]

2
src/liballoc/str.rs
View file

@ -68,7 +68,7 @@ pub use core::str::SplitWhitespace;
pub use core::str::pattern; pub use core::str::pattern;
#[stable(feature = "encode_utf16", since = "1.8.0")] #[stable(feature = "encode_utf16", since = "1.8.0")]
pub use core::str::EncodeUtf16; pub use core::str::EncodeUtf16;
#[unstable(feature = "split_ascii_whitespace", issue = "48656")] #[stable(feature = "split_ascii_whitespace", since = "1.34.0")]
pub use core::str::SplitAsciiWhitespace; pub use core::str::SplitAsciiWhitespace;
#[unstable(feature = "slice_concat_ext", #[unstable(feature = "slice_concat_ext",

11
src/libcore/str/mod.rs
View file

@ -2700,7 +2700,6 @@ impl str {
/// Basic usage: /// Basic usage:
/// ///
/// ``` /// ```
/// #![feature(split_ascii_whitespace)]
/// let mut iter = "A few words".split_ascii_whitespace(); /// let mut iter = "A few words".split_ascii_whitespace();
/// ///
/// assert_eq!(Some("A"), iter.next()); /// assert_eq!(Some("A"), iter.next());
@ -2722,7 +2721,7 @@ impl str {
/// ///
/// assert_eq!(None, iter.next()); /// assert_eq!(None, iter.next());
/// ``` /// ```
#[unstable(feature = "split_ascii_whitespace", issue = "48656")] #[stable(feature = "split_ascii_whitespace", since = "1.34.0")]
#[inline] #[inline]
pub fn split_ascii_whitespace(&self) -> SplitAsciiWhitespace { pub fn split_ascii_whitespace(&self) -> SplitAsciiWhitespace {
let inner = self let inner = self
@ -4009,7 +4008,7 @@ pub struct SplitWhitespace<'a> {
/// ///
/// [`split_ascii_whitespace`]: ../../std/primitive.str.html#method.split_ascii_whitespace /// [`split_ascii_whitespace`]: ../../std/primitive.str.html#method.split_ascii_whitespace
/// [`str`]: ../../std/primitive.str.html /// [`str`]: ../../std/primitive.str.html
#[unstable(feature = "split_ascii_whitespace", issue = "48656")] #[stable(feature = "split_ascii_whitespace", since = "1.34.0")]
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub struct SplitAsciiWhitespace<'a> { pub struct SplitAsciiWhitespace<'a> {
inner: Map<Filter<SliceSplit<'a, u8, IsAsciiWhitespace>, IsNotEmpty>, UnsafeBytesToStr>, inner: Map<Filter<SliceSplit<'a, u8, IsAsciiWhitespace>, IsNotEmpty>, UnsafeBytesToStr>,
@ -4134,7 +4133,7 @@ impl<'a> DoubleEndedIterator for SplitWhitespace<'a> {
#[stable(feature = "fused", since = "1.26.0")] #[stable(feature = "fused", since = "1.26.0")]
impl FusedIterator for SplitWhitespace<'_> {} impl FusedIterator for SplitWhitespace<'_> {}
#[unstable(feature = "split_ascii_whitespace", issue = "48656")] #[stable(feature = "split_ascii_whitespace", since = "1.34.0")]
impl<'a> Iterator for SplitAsciiWhitespace<'a> { impl<'a> Iterator for SplitAsciiWhitespace<'a> {
type Item = &'a str; type Item = &'a str;
@ -4149,7 +4148,7 @@ impl<'a> Iterator for SplitAsciiWhitespace<'a> {
} }
} }
#[unstable(feature = "split_ascii_whitespace", issue = "48656")] #[stable(feature = "split_ascii_whitespace", since = "1.34.0")]
impl<'a> DoubleEndedIterator for SplitAsciiWhitespace<'a> { impl<'a> DoubleEndedIterator for SplitAsciiWhitespace<'a> {
#[inline] #[inline]
fn next_back(&mut self) -> Option<&'a str> { fn next_back(&mut self) -> Option<&'a str> {
@ -4157,7 +4156,7 @@ impl<'a> DoubleEndedIterator for SplitAsciiWhitespace<'a> {
} }
} }
#[unstable(feature = "split_ascii_whitespace", issue = "48656")] #[stable(feature = "split_ascii_whitespace", since = "1.34.0")]
impl FusedIterator for SplitAsciiWhitespace<'_> {} impl FusedIterator for SplitAsciiWhitespace<'_> {}
/// An iterator of [`u16`] over the string encoded as UTF-16. /// An iterator of [`u16`] over the string encoded as UTF-16.