diff options
| author | Pietro Albini <pietro@pietroalbini.org> | 2019-05-31 13:34:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-31 13:34:02 +0200 |
| commit | 562602c150080cd3fd1ea9f9bafc7b0a6b4951a4 (patch) | |
| tree | 99035e3ecfc104f71b55e15e901eb79ffe7b4c3b | |
| parent | 7b83862f10b0eb9353e350cc7dd7db715db602e6 (diff) | |
| parent | 0c35c699d43ba24943bb8f38986f84c4be676dc3 (diff) | |
Rollup merge of #61363 - lzutao:stabilize-iter_nth_back, r=Centril
Stabilize iter_nth_back feature FCP done in https://github.com/rust-lang/rust/issues/56995#issuecomment-491145691 Closes #56995 r? @Centril
| -rw-r--r-- | src/liballoc/lib.rs | 1 | ||||
| -rw-r--r-- | src/libcore/iter/traits/double_ended.rs | 5 | ||||
| -rw-r--r-- | src/libcore/tests/lib.rs | 1 |
3 files changed, 1 insertions, 6 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index d90036eaf49..bfc008e14a4 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -112,7 +112,6 @@ #![feature(maybe_uninit_extra, maybe_uninit_slice, maybe_uninit_array)] #![feature(alloc_layout_extra)] #![feature(try_trait)] -#![feature(iter_nth_back)] // Allow testing this library diff --git a/src/libcore/iter/traits/double_ended.rs b/src/libcore/iter/traits/double_ended.rs index 06de95c0827..2c1aeb5690a 100644 --- a/src/libcore/iter/traits/double_ended.rs +++ b/src/libcore/iter/traits/double_ended.rs @@ -88,7 +88,6 @@ pub trait DoubleEndedIterator: Iterator { /// Basic usage: /// /// ``` - /// #![feature(iter_nth_back)] /// let a = [1, 2, 3]; /// assert_eq!(a.iter().nth_back(2), Some(&1)); /// ``` @@ -96,7 +95,6 @@ pub trait DoubleEndedIterator: Iterator { /// Calling `nth_back()` multiple times doesn't rewind the iterator: /// /// ``` - /// #![feature(iter_nth_back)] /// let a = [1, 2, 3]; /// /// let mut iter = a.iter(); @@ -108,12 +106,11 @@ pub trait DoubleEndedIterator: Iterator { /// Returning `None` if there are less than `n + 1` elements: /// /// ``` - /// #![feature(iter_nth_back)] /// let a = [1, 2, 3]; /// assert_eq!(a.iter().nth_back(10), None); /// ``` #[inline] - #[unstable(feature = "iter_nth_back", issue = "56995")] + #[stable(feature = "iter_nth_back", since = "1.37.0")] fn nth_back(&mut self, mut n: usize) -> Option<Self::Item> { for x in self.rev() { if n == 0 { return Some(x) } diff --git a/src/libcore/tests/lib.rs b/src/libcore/tests/lib.rs index c617596aba8..0dba2bed62c 100644 --- a/src/libcore/tests/lib.rs +++ b/src/libcore/tests/lib.rs @@ -10,7 +10,6 @@ #![feature(fmt_internals)] #![feature(hashmap_internals)] #![feature(is_sorted)] -#![feature(iter_nth_back)] #![feature(iter_once_with)] #![feature(pattern)] #![feature(range_is_empty)] |