diff options
| author | bors <bors@rust-lang.org> | 2024-09-07 20:37:30 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-09-07 20:37:30 +0000 |
| commit | 12b26c13fba25c9e1bc2fdf05f3c2dbb851c83de (patch) | |
| tree | ebe3578a3ce2cccc73d7185a81e3739ac0b13876 /library/alloc | |
| parent | ec867f03bcd6c39156ef13eb5f85bf4fb924ca29 (diff) | |
| parent | 0091b8ab2a16aea880e2fe5d3c876f4f743640d5 (diff) | |
| download | rust-12b26c13fba25c9e1bc2fdf05f3c2dbb851c83de.tar.gz rust-12b26c13fba25c9e1bc2fdf05f3c2dbb851c83de.zip | |
Auto merge of #129941 - BoxyUwU:bump-boostrap, r=albertlarsan68
Bump boostrap compiler to new beta Accidentally left some comments on the update cfgs commit directly xd
Diffstat (limited to 'library/alloc')
| -rw-r--r-- | library/alloc/src/boxed.rs | 8 | ||||
| -rw-r--r-- | library/alloc/src/collections/binary_heap/mod.rs | 2 | ||||
| -rw-r--r-- | library/alloc/src/collections/btree/map.rs | 4 | ||||
| -rw-r--r-- | library/alloc/src/collections/vec_deque/into_iter.rs | 4 | ||||
| -rw-r--r-- | library/alloc/src/collections/vec_deque/iter.rs | 2 | ||||
| -rw-r--r-- | library/alloc/src/collections/vec_deque/iter_mut.rs | 2 | ||||
| -rw-r--r-- | library/alloc/src/rc.rs | 8 | ||||
| -rw-r--r-- | library/alloc/src/sync.rs | 8 |
8 files changed, 17 insertions, 21 deletions
diff --git a/library/alloc/src/boxed.rs b/library/alloc/src/boxed.rs index a924feaf15f..6dc75478700 100644 --- a/library/alloc/src/boxed.rs +++ b/library/alloc/src/boxed.rs @@ -272,7 +272,7 @@ impl<T> Box<T> { /// assert_eq!(*five, 5) /// ``` #[cfg(not(no_global_oom_handling))] - #[stable(feature = "new_uninit", since = "CURRENT_RUSTC_VERSION")] + #[stable(feature = "new_uninit", since = "1.82.0")] #[must_use] #[inline] pub fn new_uninit() -> Box<mem::MaybeUninit<T>> { @@ -663,7 +663,7 @@ impl<T> Box<[T]> { /// assert_eq!(*values, [1, 2, 3]) /// ``` #[cfg(not(no_global_oom_handling))] - #[stable(feature = "new_uninit", since = "CURRENT_RUSTC_VERSION")] + #[stable(feature = "new_uninit", since = "1.82.0")] #[must_use] pub fn new_uninit_slice(len: usize) -> Box<[mem::MaybeUninit<T>]> { unsafe { RawVec::with_capacity(len).into_box(len) } @@ -930,7 +930,7 @@ impl<T, A: Allocator> Box<mem::MaybeUninit<T>, A> { /// /// assert_eq!(*five, 5) /// ``` - #[stable(feature = "new_uninit", since = "CURRENT_RUSTC_VERSION")] + #[stable(feature = "new_uninit", since = "1.82.0")] #[inline] pub unsafe fn assume_init(self) -> Box<T, A> { let (raw, alloc) = Box::into_raw_with_allocator(self); @@ -1003,7 +1003,7 @@ impl<T, A: Allocator> Box<[mem::MaybeUninit<T>], A> { /// /// assert_eq!(*values, [1, 2, 3]) /// ``` - #[stable(feature = "new_uninit", since = "CURRENT_RUSTC_VERSION")] + #[stable(feature = "new_uninit", since = "1.82.0")] #[inline] pub unsafe fn assume_init(self) -> Box<[T], A> { let (raw, alloc) = Box::into_raw_with_allocator(self); diff --git a/library/alloc/src/collections/binary_heap/mod.rs b/library/alloc/src/collections/binary_heap/mod.rs index 88701370c10..fe9f1010d32 100644 --- a/library/alloc/src/collections/binary_heap/mod.rs +++ b/library/alloc/src/collections/binary_heap/mod.rs @@ -1433,7 +1433,7 @@ pub struct Iter<'a, T: 'a> { iter: slice::Iter<'a, T>, } -#[stable(feature = "default_iters_sequel", since = "CURRENT_RUSTC_VERSION")] +#[stable(feature = "default_iters_sequel", since = "1.82.0")] impl<T> Default for Iter<'_, T> { /// Creates an empty `binary_heap::Iter`. /// diff --git a/library/alloc/src/collections/btree/map.rs b/library/alloc/src/collections/btree/map.rs index c7908578522..60e08b47e3d 100644 --- a/library/alloc/src/collections/btree/map.rs +++ b/library/alloc/src/collections/btree/map.rs @@ -2016,7 +2016,7 @@ impl<K, V> Default for Range<'_, K, V> { } } -#[stable(feature = "default_iters_sequel", since = "CURRENT_RUSTC_VERSION")] +#[stable(feature = "default_iters_sequel", since = "1.82.0")] impl<K, V> Default for RangeMut<'_, K, V> { /// Creates an empty `btree_map::RangeMut`. /// @@ -2064,7 +2064,7 @@ impl<K, V> ExactSizeIterator for ValuesMut<'_, K, V> { #[stable(feature = "fused", since = "1.26.0")] impl<K, V> FusedIterator for ValuesMut<'_, K, V> {} -#[stable(feature = "default_iters_sequel", since = "CURRENT_RUSTC_VERSION")] +#[stable(feature = "default_iters_sequel", since = "1.82.0")] impl<K, V> Default for ValuesMut<'_, K, V> { /// Creates an empty `btree_map::ValuesMut`. /// diff --git a/library/alloc/src/collections/vec_deque/into_iter.rs b/library/alloc/src/collections/vec_deque/into_iter.rs index 7be3de16b2d..2b09a5e7ddc 100644 --- a/library/alloc/src/collections/vec_deque/into_iter.rs +++ b/library/alloc/src/collections/vec_deque/into_iter.rs @@ -121,8 +121,6 @@ impl<T, A: Allocator> Iterator for IntoIter<T, A> { { match self.try_fold(init, |b, item| Ok::<B, !>(f(b, item))) { Ok(b) => b, - #[cfg(bootstrap)] - Err(e) => match e {}, } } @@ -243,8 +241,6 @@ impl<T, A: Allocator> DoubleEndedIterator for IntoIter<T, A> { { match self.try_rfold(init, |b, item| Ok::<B, !>(f(b, item))) { Ok(b) => b, - #[cfg(bootstrap)] - Err(e) => match e {}, } } } diff --git a/library/alloc/src/collections/vec_deque/iter.rs b/library/alloc/src/collections/vec_deque/iter.rs index 67b5b91c4d4..bf4dd66f476 100644 --- a/library/alloc/src/collections/vec_deque/iter.rs +++ b/library/alloc/src/collections/vec_deque/iter.rs @@ -28,7 +28,7 @@ impl<T: fmt::Debug> fmt::Debug for Iter<'_, T> { } } -#[stable(feature = "default_iters_sequel", since = "CURRENT_RUSTC_VERSION")] +#[stable(feature = "default_iters_sequel", since = "1.82.0")] impl<T> Default for Iter<'_, T> { /// Creates an empty `vec_deque::Iter`. /// diff --git a/library/alloc/src/collections/vec_deque/iter_mut.rs b/library/alloc/src/collections/vec_deque/iter_mut.rs index 2726e3e4252..7a349a1b4ed 100644 --- a/library/alloc/src/collections/vec_deque/iter_mut.rs +++ b/library/alloc/src/collections/vec_deque/iter_mut.rs @@ -28,7 +28,7 @@ impl<T: fmt::Debug> fmt::Debug for IterMut<'_, T> { } } -#[stable(feature = "default_iters_sequel", since = "CURRENT_RUSTC_VERSION")] +#[stable(feature = "default_iters_sequel", since = "1.82.0")] impl<T> Default for IterMut<'_, T> { /// Creates an empty `vec_deque::IterMut`. /// diff --git a/library/alloc/src/rc.rs b/library/alloc/src/rc.rs index 1b31a78394e..88c7a12db23 100644 --- a/library/alloc/src/rc.rs +++ b/library/alloc/src/rc.rs @@ -517,7 +517,7 @@ impl<T> Rc<T> { /// assert_eq!(*five, 5) /// ``` #[cfg(not(no_global_oom_handling))] - #[stable(feature = "new_uninit", since = "CURRENT_RUSTC_VERSION")] + #[stable(feature = "new_uninit", since = "1.82.0")] #[must_use] pub fn new_uninit() -> Rc<mem::MaybeUninit<T>> { unsafe { @@ -980,7 +980,7 @@ impl<T> Rc<[T]> { /// assert_eq!(*values, [1, 2, 3]) /// ``` #[cfg(not(no_global_oom_handling))] - #[stable(feature = "new_uninit", since = "CURRENT_RUSTC_VERSION")] + #[stable(feature = "new_uninit", since = "1.82.0")] #[must_use] pub fn new_uninit_slice(len: usize) -> Rc<[mem::MaybeUninit<T>]> { unsafe { Rc::from_ptr(Rc::allocate_for_slice(len)) } @@ -1127,7 +1127,7 @@ impl<T, A: Allocator> Rc<mem::MaybeUninit<T>, A> { /// /// assert_eq!(*five, 5) /// ``` - #[stable(feature = "new_uninit", since = "CURRENT_RUSTC_VERSION")] + #[stable(feature = "new_uninit", since = "1.82.0")] #[inline] pub unsafe fn assume_init(self) -> Rc<T, A> { let (ptr, alloc) = Rc::into_inner_with_allocator(self); @@ -1167,7 +1167,7 @@ impl<T, A: Allocator> Rc<[mem::MaybeUninit<T>], A> { /// /// assert_eq!(*values, [1, 2, 3]) /// ``` - #[stable(feature = "new_uninit", since = "CURRENT_RUSTC_VERSION")] + #[stable(feature = "new_uninit", since = "1.82.0")] #[inline] pub unsafe fn assume_init(self) -> Rc<[T], A> { let (ptr, alloc) = Rc::into_inner_with_allocator(self); diff --git a/library/alloc/src/sync.rs b/library/alloc/src/sync.rs index 024a794f17b..43684f31cb7 100644 --- a/library/alloc/src/sync.rs +++ b/library/alloc/src/sync.rs @@ -520,7 +520,7 @@ impl<T> Arc<T> { /// ``` #[cfg(not(no_global_oom_handling))] #[inline] - #[stable(feature = "new_uninit", since = "CURRENT_RUSTC_VERSION")] + #[stable(feature = "new_uninit", since = "1.82.0")] #[must_use] pub fn new_uninit() -> Arc<mem::MaybeUninit<T>> { unsafe { @@ -1115,7 +1115,7 @@ impl<T> Arc<[T]> { /// ``` #[cfg(not(no_global_oom_handling))] #[inline] - #[stable(feature = "new_uninit", since = "CURRENT_RUSTC_VERSION")] + #[stable(feature = "new_uninit", since = "1.82.0")] #[must_use] pub fn new_uninit_slice(len: usize) -> Arc<[mem::MaybeUninit<T>]> { unsafe { Arc::from_ptr(Arc::allocate_for_slice(len)) } @@ -1262,7 +1262,7 @@ impl<T, A: Allocator> Arc<mem::MaybeUninit<T>, A> { /// /// assert_eq!(*five, 5) /// ``` - #[stable(feature = "new_uninit", since = "CURRENT_RUSTC_VERSION")] + #[stable(feature = "new_uninit", since = "1.82.0")] #[must_use = "`self` will be dropped if the result is not used"] #[inline] pub unsafe fn assume_init(self) -> Arc<T, A> { @@ -1303,7 +1303,7 @@ impl<T, A: Allocator> Arc<[mem::MaybeUninit<T>], A> { /// /// assert_eq!(*values, [1, 2, 3]) /// ``` - #[stable(feature = "new_uninit", since = "CURRENT_RUSTC_VERSION")] + #[stable(feature = "new_uninit", since = "1.82.0")] #[must_use = "`self` will be dropped if the result is not used"] #[inline] pub unsafe fn assume_init(self) -> Arc<[T], A> { |
