diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-01-18 04:42:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-18 04:42:11 +0100 |
| commit | 83b1a9452ac01291ccc45b226e3e7ac37e31a0f8 (patch) | |
| tree | 54bc8607d68771ddf28481e37e5619a1fd8c1056 | |
| parent | b8c544de71016e86dc0b9f6718fb59b4d59e51b2 (diff) | |
| parent | e012b9a78d5cea530dc158a74ecd96e524cca4f7 (diff) | |
| download | rust-83b1a9452ac01291ccc45b226e3e7ac37e31a0f8.tar.gz rust-83b1a9452ac01291ccc45b226e3e7ac37e31a0f8.zip | |
Rollup merge of #93016 - Amanieu:vec_spare_capacity, r=Mark-Simulacrum
Stabilize vec_spare_capacity Closes #75017
| -rw-r--r-- | library/alloc/src/vec/mod.rs | 4 | ||||
| -rw-r--r-- | library/alloc/tests/lib.rs | 1 | ||||
| -rw-r--r-- | library/core/src/mem/maybe_uninit.rs | 4 | ||||
| -rw-r--r-- | library/std/src/lib.rs | 1 | ||||
| m--------- | library/stdarch | 0 |
5 files changed, 3 insertions, 7 deletions
diff --git a/library/alloc/src/vec/mod.rs b/library/alloc/src/vec/mod.rs index 16ba5c008cd..bd3262b51d4 100644 --- a/library/alloc/src/vec/mod.rs +++ b/library/alloc/src/vec/mod.rs @@ -2051,8 +2051,6 @@ impl<T, A: Allocator> Vec<T, A> { /// # Examples /// /// ``` - /// #![feature(vec_spare_capacity)] - /// /// // Allocate vector big enough for 10 elements. /// let mut v = Vec::with_capacity(10); /// @@ -2069,7 +2067,7 @@ impl<T, A: Allocator> Vec<T, A> { /// /// assert_eq!(&v, &[0, 1, 2]); /// ``` - #[unstable(feature = "vec_spare_capacity", issue = "75017")] + #[stable(feature = "vec_spare_capacity", since = "1.60.0")] #[inline] pub fn spare_capacity_mut(&mut self) -> &mut [MaybeUninit<T>] { // Note: diff --git a/library/alloc/tests/lib.rs b/library/alloc/tests/lib.rs index 7b8eeb90b5a..dcf51e3142a 100644 --- a/library/alloc/tests/lib.rs +++ b/library/alloc/tests/lib.rs @@ -31,7 +31,6 @@ #![feature(iter_advance_by)] #![feature(slice_group_by)] #![feature(slice_partition_dedup)] -#![feature(vec_spare_capacity)] #![feature(string_remove_matches)] #![feature(const_btree_new)] #![feature(const_default_impls)] diff --git a/library/core/src/mem/maybe_uninit.rs b/library/core/src/mem/maybe_uninit.rs index dd2f7306356..56bdc6beb90 100644 --- a/library/core/src/mem/maybe_uninit.rs +++ b/library/core/src/mem/maybe_uninit.rs @@ -1038,7 +1038,7 @@ impl<T> MaybeUninit<T> { /// ``` /// /// ``` - /// #![feature(maybe_uninit_write_slice, vec_spare_capacity)] + /// #![feature(maybe_uninit_write_slice)] /// use std::mem::MaybeUninit; /// /// let mut vec = Vec::with_capacity(32); @@ -1098,7 +1098,7 @@ impl<T> MaybeUninit<T> { /// ``` /// /// ``` - /// #![feature(maybe_uninit_write_slice, vec_spare_capacity)] + /// #![feature(maybe_uninit_write_slice)] /// use std::mem::MaybeUninit; /// /// let mut vec = Vec::with_capacity(32); diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs index 4f630dcb04d..17fe0011569 100644 --- a/library/std/src/lib.rs +++ b/library/std/src/lib.rs @@ -340,7 +340,6 @@ #![feature(unboxed_closures)] #![feature(unwrap_infallible)] #![feature(vec_into_raw_parts)] -#![feature(vec_spare_capacity)] // NB: the above list is sorted to minimize merge conflicts. #![default_lib_allocator] diff --git a/library/stdarch b/library/stdarch -Subproject 2adc17a5442614dbe34626fdd9b32de7c07b808 +Subproject 1d5d0e8b0e3134dc781adb98057e38ffdf200df |