diff options
| author | bors <bors@rust-lang.org> | 2020-01-12 02:28:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-01-12 02:28:48 +0000 |
| commit | 0b6c116a84fb1dbb60b5870291f5d7df808c280d (patch) | |
| tree | 22efe869664863f74b929dcb29f0b28ad2ce25e6 /src/liballoc | |
| parent | f363745872f9b45cfec575f3c2cac42f0c242c03 (diff) | |
| parent | 82c19b4388dc671dd4c1224b8577a5e23ff315e4 (diff) | |
| download | rust-0b6c116a84fb1dbb60b5870291f5d7df808c280d.tar.gz rust-0b6c116a84fb1dbb60b5870291f5d7df808c280d.zip | |
Auto merge of #68142 - Centril:rollup-dl232e9, r=Centril
Rollup of 6 pull requests Successful merges: - #67494 (Constify more of alloc::Layout) - #67867 (Correctly check for opaque types in `assoc_ty_def`) - #67948 (Galloping search for binary_search_util) - #68045 (Move more of `rustc::lint` into `rustc_lint`) - #68089 (Unstabilize `Vec::remove_item`) - #68108 (Add suggestions when encountering chained comparisons) 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 | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/liballoc/tests/lib.rs b/src/liballoc/tests/lib.rs index 3fdee8bbfdf..c1ae67a1a33 100644 --- a/src/liballoc/tests/lib.rs +++ b/src/liballoc/tests/lib.rs @@ -11,6 +11,7 @@ #![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 f5f8d88829f..e9cbf627846 100644 --- a/src/liballoc/vec.rs +++ b/src/liballoc/vec.rs @@ -1696,13 +1696,14 @@ 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]); /// ``` - #[stable(feature = "vec_remove_item", since = "1.42.0")] + #[unstable(feature = "vec_remove_item", reason = "recently added", issue = "40062")] pub fn remove_item<V>(&mut self, item: &V) -> Option<T> where T: PartialEq<V>, |
