diff options
| author | bors <bors@rust-lang.org> | 2022-03-31 05:12:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-03-31 05:12:45 +0000 |
| commit | ffaf6f0d0ccfbc76da00baded073d10f05ffcbd1 (patch) | |
| tree | c52a1a6ff3a746fa75dc69b5edd1a15c7dfcfaae /library/alloc/src | |
| parent | a39ac5ae175e0f9f910b1800a430b488ec0f2105 (diff) | |
| parent | 1b7d6dbd3043a002279e9ebafc0b082f4d891200 (diff) | |
| download | rust-ffaf6f0d0ccfbc76da00baded073d10f05ffcbd1.tar.gz rust-ffaf6f0d0ccfbc76da00baded073d10f05ffcbd1.zip | |
Auto merge of #95506 - Dylan-DPC:rollup-b6kxzjc, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #95130 (Stabilize thread::is_finished) - #95263 (Restore `impl Future<Output = Type>` to async blocks) - #95471 (Don't ICE when opaque types get their hidden type constrained again.) - #95491 (Stabilize feature vec_retain_mut on Vec and VecDeque) - #95497 (Spellchecking compiler comments) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/alloc/src')
| -rw-r--r-- | library/alloc/src/collections/vec_deque/mod.rs | 4 | ||||
| -rw-r--r-- | library/alloc/src/vec/mod.rs | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/library/alloc/src/collections/vec_deque/mod.rs b/library/alloc/src/collections/vec_deque/mod.rs index 63280e56332..dcae58ae590 100644 --- a/library/alloc/src/collections/vec_deque/mod.rs +++ b/library/alloc/src/collections/vec_deque/mod.rs @@ -2185,8 +2185,6 @@ impl<T, A: Allocator> VecDeque<T, A> { /// # Examples /// /// ``` - /// #![feature(vec_retain_mut)] - /// /// use std::collections::VecDeque; /// /// let mut buf = VecDeque::new(); @@ -2199,7 +2197,7 @@ impl<T, A: Allocator> VecDeque<T, A> { /// }); /// assert_eq!(buf, [3, 5]); /// ``` - #[unstable(feature = "vec_retain_mut", issue = "90829")] + #[stable(feature = "vec_retain_mut", since = "1.61.0")] pub fn retain_mut<F>(&mut self, mut f: F) where F: FnMut(&mut T) -> bool, diff --git a/library/alloc/src/vec/mod.rs b/library/alloc/src/vec/mod.rs index 9773ec02337..0b62622de81 100644 --- a/library/alloc/src/vec/mod.rs +++ b/library/alloc/src/vec/mod.rs @@ -1467,8 +1467,6 @@ impl<T, A: Allocator> Vec<T, A> { /// # Examples /// /// ``` - /// #![feature(vec_retain_mut)] - /// /// let mut vec = vec![1, 2, 3, 4]; /// vec.retain_mut(|x| if *x > 3 { /// false @@ -1478,7 +1476,7 @@ impl<T, A: Allocator> Vec<T, A> { /// }); /// assert_eq!(vec, [2, 3, 4]); /// ``` - #[unstable(feature = "vec_retain_mut", issue = "90829")] + #[stable(feature = "vec_retain_mut", since = "1.61.0")] pub fn retain_mut<F>(&mut self, mut f: F) where F: FnMut(&mut T) -> bool, |