提交 be226e49 编写于 作者: I Ian Jackson

Stabilize split_inclusive

Closes #72360.
Signed-off-by: NIan Jackson <ijackson@chiark.greenend.org.uk>
上级 ab5b9aec
......@@ -14,7 +14,6 @@
#![feature(binary_heap_into_iter_sorted)]
#![feature(binary_heap_drain_sorted)]
#![feature(slice_ptr_get)]
#![feature(split_inclusive)]
#![feature(binary_heap_retain)]
#![feature(inplace_iteration)]
#![feature(iter_map_while)]
......
......@@ -446,15 +446,13 @@ impl<T, P> FusedIterator for Split<'_, T, P> where P: FnMut(&T) -> bool {}
/// # Example
///
/// ```
/// #![feature(split_inclusive)]
///
/// let slice = [10, 40, 33, 20];
/// let mut iter = slice.split_inclusive(|num| num % 3 == 0);
/// ```
///
/// [`split_inclusive`]: ../../std/primitive.slice.html#method.split_inclusive
/// [slices]: ../../std/primitive.slice.html
#[unstable(feature = "split_inclusive", issue = "72360")]
#[stable(feature = "split_inclusive", since = "1.49.0")]
pub struct SplitInclusive<'a, T: 'a, P>
where
P: FnMut(&T) -> bool,
......@@ -471,7 +469,7 @@ pub(super) fn new(slice: &'a [T], pred: P) -> Self {
}
}
#[unstable(feature = "split_inclusive", issue = "72360")]
#[stable(feature = "split_inclusive", since = "1.49.0")]
impl<T: fmt::Debug, P> fmt::Debug for SplitInclusive<'_, T, P>
where
P: FnMut(&T) -> bool,
......@@ -485,7 +483,7 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
}
// FIXME(#26925) Remove in favor of `#[derive(Clone)]`
#[unstable(feature = "split_inclusive", issue = "72360")]
#[stable(feature = "split_inclusive", since = "1.49.0")]
impl<T, P> Clone for SplitInclusive<'_, T, P>
where
P: Clone + FnMut(&T) -> bool,
......@@ -495,7 +493,7 @@ fn clone(&self) -> Self {
}
}
#[unstable(feature = "split_inclusive", issue = "72360")]
#[stable(feature = "split_inclusive", since = "1.49.0")]
impl<'a, T, P> Iterator for SplitInclusive<'a, T, P>
where
P: FnMut(&T) -> bool,
......@@ -524,7 +522,7 @@ fn size_hint(&self) -> (usize, Option<usize>) {
}
}
#[unstable(feature = "split_inclusive", issue = "72360")]
#[stable(feature = "split_inclusive", since = "1.49.0")]
impl<'a, T, P> DoubleEndedIterator for SplitInclusive<'a, T, P>
where
P: FnMut(&T) -> bool,
......@@ -549,7 +547,7 @@ fn next_back(&mut self) -> Option<&'a [T]> {
}
}
#[unstable(feature = "split_inclusive", issue = "72360")]
#[stable(feature = "split_inclusive", since = "1.49.0")]
impl<T, P> FusedIterator for SplitInclusive<'_, T, P> where P: FnMut(&T) -> bool {}
/// An iterator over the mutable subslices of the vector which are separated
......@@ -689,15 +687,13 @@ impl<T, P> FusedIterator for SplitMut<'_, T, P> where P: FnMut(&T) -> bool {}
/// # Example
///
/// ```
/// #![feature(split_inclusive)]
///
/// let mut v = [10, 40, 30, 20, 60, 50];
/// let iter = v.split_inclusive_mut(|num| *num % 3 == 0);
/// ```
///
/// [`split_inclusive_mut`]: ../../std/primitive.slice.html#method.split_inclusive_mut
/// [slices]: ../../std/primitive.slice.html
#[unstable(feature = "split_inclusive", issue = "72360")]
#[stable(feature = "split_inclusive", since = "1.49.0")]
pub struct SplitInclusiveMut<'a, T: 'a, P>
where
P: FnMut(&T) -> bool,
......@@ -714,7 +710,7 @@ pub(super) fn new(slice: &'a mut [T], pred: P) -> Self {
}
}
#[unstable(feature = "split_inclusive", issue = "72360")]
#[stable(feature = "split_inclusive", since = "1.49.0")]
impl<T: fmt::Debug, P> fmt::Debug for SplitInclusiveMut<'_, T, P>
where
P: FnMut(&T) -> bool,
......@@ -727,7 +723,7 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
}
}
#[unstable(feature = "split_inclusive", issue = "72360")]
#[stable(feature = "split_inclusive", since = "1.49.0")]
impl<'a, T, P> Iterator for SplitInclusiveMut<'a, T, P>
where
P: FnMut(&T) -> bool,
......@@ -767,7 +763,7 @@ fn size_hint(&self) -> (usize, Option<usize>) {
}
}
#[unstable(feature = "split_inclusive", issue = "72360")]
#[stable(feature = "split_inclusive", since = "1.49.0")]
impl<'a, T, P> DoubleEndedIterator for SplitInclusiveMut<'a, T, P>
where
P: FnMut(&T) -> bool,
......@@ -801,7 +797,7 @@ fn next_back(&mut self) -> Option<&'a mut [T]> {
}
}
#[unstable(feature = "split_inclusive", issue = "72360")]
#[stable(feature = "split_inclusive", since = "1.49.0")]
impl<T, P> FusedIterator for SplitInclusiveMut<'_, T, P> where P: FnMut(&T) -> bool {}
/// An iterator over subslices separated by elements that match a predicate
......
......@@ -60,7 +60,7 @@
#[unstable(feature = "slice_group_by", issue = "80552")]
pub use iter::{GroupBy, GroupByMut};
#[unstable(feature = "split_inclusive", issue = "72360")]
#[stable(feature = "split_inclusive", since = "1.49.0")]
pub use iter::{SplitInclusive, SplitInclusiveMut};
#[stable(feature = "rust1", since = "1.0.0")]
......@@ -1549,7 +1549,6 @@ pub fn split_mut<F>(&mut self, pred: F) -> SplitMut<'_, T, F>
/// # Examples
///
/// ```
/// #![feature(split_inclusive)]
/// let slice = [10, 40, 33, 20];
/// let mut iter = slice.split_inclusive(|num| num % 3 == 0);
///
......@@ -1563,7 +1562,6 @@ pub fn split_mut<F>(&mut self, pred: F) -> SplitMut<'_, T, F>
/// That slice will be the last item returned by the iterator.
///
/// ```
/// #![feature(split_inclusive)]
/// let slice = [3, 10, 40, 33];
/// let mut iter = slice.split_inclusive(|num| num % 3 == 0);
///
......@@ -1571,7 +1569,7 @@ pub fn split_mut<F>(&mut self, pred: F) -> SplitMut<'_, T, F>
/// assert_eq!(iter.next().unwrap(), &[10, 40, 33]);
/// assert!(iter.next().is_none());
/// ```
#[unstable(feature = "split_inclusive", issue = "72360")]
#[stable(feature = "split_inclusive", since = "1.49.0")]
#[inline]
pub fn split_inclusive<F>(&self, pred: F) -> SplitInclusive<'_, T, F>
where
......@@ -1587,7 +1585,6 @@ pub fn split_inclusive<F>(&self, pred: F) -> SplitInclusive<'_, T, F>
/// # Examples
///
/// ```
/// #![feature(split_inclusive)]
/// let mut v = [10, 40, 30, 20, 60, 50];
///
/// for group in v.split_inclusive_mut(|num| *num % 3 == 0) {
......@@ -1596,7 +1593,7 @@ pub fn split_inclusive<F>(&self, pred: F) -> SplitInclusive<'_, T, F>
/// }
/// assert_eq!(v, [10, 40, 1, 20, 1, 1]);
/// ```
#[unstable(feature = "split_inclusive", issue = "72360")]
#[stable(feature = "split_inclusive", since = "1.49.0")]
#[inline]
pub fn split_inclusive_mut<F>(&mut self, pred: F) -> SplitInclusiveMut<'_, T, F>
where
......
......@@ -1174,7 +1174,7 @@ pub struct SplitAsciiWhitespace<'a> {
/// See its documentation for more.
///
/// [`split_inclusive`]: str::split_inclusive
#[unstable(feature = "split_inclusive", issue = "72360")]
#[stable(feature = "split_inclusive", since = "1.49.0")]
pub struct SplitInclusive<'a, P: Pattern<'a>>(pub(super) SplitInternal<'a, P>);
#[stable(feature = "split_whitespace", since = "1.1.0")]
......@@ -1239,7 +1239,7 @@ fn next_back(&mut self) -> Option<&'a str> {
#[stable(feature = "split_ascii_whitespace", since = "1.34.0")]
impl FusedIterator for SplitAsciiWhitespace<'_> {}
#[unstable(feature = "split_inclusive", issue = "72360")]
#[stable(feature = "split_inclusive", since = "1.49.0")]
impl<'a, P: Pattern<'a>> Iterator for SplitInclusive<'a, P> {
type Item = &'a str;
......@@ -1249,7 +1249,7 @@ fn next(&mut self) -> Option<&'a str> {
}
}
#[unstable(feature = "split_inclusive", issue = "72360")]
#[stable(feature = "split_inclusive", since = "1.49.0")]
impl<'a, P: Pattern<'a, Searcher: fmt::Debug>> fmt::Debug for SplitInclusive<'a, P> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_struct("SplitInclusive").field("0", &self.0).finish()
......@@ -1257,14 +1257,14 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
}
// FIXME(#26925) Remove in favor of `#[derive(Clone)]`
#[unstable(feature = "split_inclusive", issue = "72360")]
#[stable(feature = "split_inclusive", since = "1.49.0")]
impl<'a, P: Pattern<'a, Searcher: Clone>> Clone for SplitInclusive<'a, P> {
fn clone(&self) -> Self {
SplitInclusive(self.0.clone())
}
}
#[unstable(feature = "split_inclusive", issue = "72360")]
#[stable(feature = "split_inclusive", since = "1.49.0")]
impl<'a, P: Pattern<'a, Searcher: ReverseSearcher<'a>>> DoubleEndedIterator
for SplitInclusive<'a, P>
{
......@@ -1274,7 +1274,7 @@ fn next_back(&mut self) -> Option<&'a str> {
}
}
#[unstable(feature = "split_inclusive", issue = "72360")]
#[stable(feature = "split_inclusive", since = "1.49.0")]
impl<'a, P: Pattern<'a>> FusedIterator for SplitInclusive<'a, P> {}
impl<'a, P: Pattern<'a>> SplitInclusive<'a, P> {
......
......@@ -65,7 +65,7 @@
#[stable(feature = "split_ascii_whitespace", since = "1.34.0")]
pub use iter::SplitAsciiWhitespace;
#[unstable(feature = "split_inclusive", issue = "72360")]
#[stable(feature = "split_inclusive", since = "1.49.0")]
use iter::SplitInclusive;
#[unstable(feature = "str_internals", issue = "none")]
......@@ -1227,7 +1227,6 @@ pub fn split<'a, P: Pattern<'a>>(&'a self, pat: P) -> Split<'a, P> {
/// # Examples
///
/// ```
/// #![feature(split_inclusive)]
/// let v: Vec<&str> = "Mary had a little lamb\nlittle lamb\nlittle lamb."
/// .split_inclusive('\n').collect();
/// assert_eq!(v, ["Mary had a little lamb\n", "little lamb\n", "little lamb."]);
......@@ -1238,12 +1237,11 @@ pub fn split<'a, P: Pattern<'a>>(&'a self, pat: P) -> Split<'a, P> {
/// That substring will be the last item returned by the iterator.
///
/// ```
/// #![feature(split_inclusive)]
/// let v: Vec<&str> = "Mary had a little lamb\nlittle lamb\nlittle lamb.\n"
/// .split_inclusive('\n').collect();
/// assert_eq!(v, ["Mary had a little lamb\n", "little lamb\n", "little lamb.\n"]);
/// ```
#[unstable(feature = "split_inclusive", issue = "72360")]
#[stable(feature = "split_inclusive", since = "1.49.0")]
#[inline]
pub fn split_inclusive<'a, P: Pattern<'a>>(&'a self, pat: P) -> SplitInclusive<'a, P> {
SplitInclusive(SplitInternal {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册