diff options
| author | bors <bors@rust-lang.org> | 2020-01-07 04:54:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-01-07 04:54:02 +0000 |
| commit | 4f074dea1dbf28d7519bf408b7530e8cba019243 (patch) | |
| tree | 32898820efab3cbd1ab73a44cfdeeb49650880ff /src/liballoc | |
| parent | aa0769b92e60f5298f0b6326b8654c9b04351b98 (diff) | |
| parent | 23d97880bc2b5022fb4331cdff90550de7fc5328 (diff) | |
| download | rust-4f074dea1dbf28d7519bf408b7530e8cba019243.tar.gz rust-4f074dea1dbf28d7519bf408b7530e8cba019243.zip | |
Auto merge of #67964 - JohnTitor:rollup-pu5kosl, r=JohnTitor
Rollup of 13 pull requests Successful merges: - #67566 (Add an unstable conversion from thread ID to u64) - #67671 (Account for `type X = impl Trait;` in lifetime suggestion) - #67727 (Stabilise vec::remove_item) - #67877 (Omit underscore constants from rustdoc) - #67880 (Handle multiple error fix suggestions carefuly) - #67898 (Improve hygiene of `newtype_index`) - #67908 (rustdoc: HTML escape const values) - #67909 (Fix ICE in const pretty printing and resolve FIXME) - #67929 (Formatting an example for method Vec.retain) - #67934 (Clean up E0178 explanation) - #67936 (fire "non_camel_case_types" for associated types) - #67943 (Missing module std in example.) - #67962 (Update books) Failed merges: r? @ghost
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/tests/lib.rs | 1 | ||||
| -rw-r--r-- | src/liballoc/vec.rs | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/liballoc/tests/lib.rs b/src/liballoc/tests/lib.rs index c1ae67a1a33..3fdee8bbfdf 100644 --- a/src/liballoc/tests/lib.rs +++ b/src/liballoc/tests/lib.rs @@ -11,7 +11,6 @@ #![feature(associated_type_bounds)] #![feature(binary_heap_into_iter_sorted)] #![feature(binary_heap_drain_sorted)] -#![feature(vec_remove_item)] use std::collections::hash_map::DefaultHasher; use std::hash::{Hash, Hasher}; diff --git a/src/liballoc/vec.rs b/src/liballoc/vec.rs index a27a13847d6..f5f8d88829f 100644 --- a/src/liballoc/vec.rs +++ b/src/liballoc/vec.rs @@ -1054,7 +1054,7 @@ impl<T> Vec<T> { /// /// ``` /// let mut vec = vec![1, 2, 3, 4]; - /// vec.retain(|&x| x%2 == 0); + /// vec.retain(|&x| x % 2 == 0); /// assert_eq!(vec, [2, 4]); /// ``` /// @@ -1696,14 +1696,13 @@ impl<T> Vec<T> { /// # Examples /// /// ``` - /// # #![feature(vec_remove_item)] /// let mut vec = vec![1, 2, 3, 1]; /// /// vec.remove_item(&1); /// /// assert_eq!(vec, vec![2, 3, 1]); /// ``` - #[unstable(feature = "vec_remove_item", reason = "recently added", issue = "40062")] + #[stable(feature = "vec_remove_item", since = "1.42.0")] pub fn remove_item<V>(&mut self, item: &V) -> Option<T> where T: PartialEq<V>, |