Skip to content

Commit e415426

Browse files
committed
Auto merge of rust-lang#129941 - BoxyUwU:bump-boostrap, r=albertlarsan68
Bump boostrap compiler to new beta Accidentally left some comments on the update cfgs commit directly xd
2 parents 0f66aa3 + 6aa8763 commit e415426

File tree

39 files changed

+77
-140
lines changed

39 files changed

+77
-140
lines changed

alloc/src/boxed.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ impl<T> Box<T> {
272272
/// assert_eq!(*five, 5)
273273
/// ```
274274
#[cfg(not(no_global_oom_handling))]
275-
#[stable(feature = "new_uninit", since = "CURRENT_RUSTC_VERSION")]
275+
#[stable(feature = "new_uninit", since = "1.82.0")]
276276
#[must_use]
277277
#[inline]
278278
pub fn new_uninit() -> Box<mem::MaybeUninit<T>> {
@@ -663,7 +663,7 @@ impl<T> Box<[T]> {
663663
/// assert_eq!(*values, [1, 2, 3])
664664
/// ```
665665
#[cfg(not(no_global_oom_handling))]
666-
#[stable(feature = "new_uninit", since = "CURRENT_RUSTC_VERSION")]
666+
#[stable(feature = "new_uninit", since = "1.82.0")]
667667
#[must_use]
668668
pub fn new_uninit_slice(len: usize) -> Box<[mem::MaybeUninit<T>]> {
669669
unsafe { RawVec::with_capacity(len).into_box(len) }
@@ -930,7 +930,7 @@ impl<T, A: Allocator> Box<mem::MaybeUninit<T>, A> {
930930
///
931931
/// assert_eq!(*five, 5)
932932
/// ```
933-
#[stable(feature = "new_uninit", since = "CURRENT_RUSTC_VERSION")]
933+
#[stable(feature = "new_uninit", since = "1.82.0")]
934934
#[inline]
935935
pub unsafe fn assume_init(self) -> Box<T, A> {
936936
let (raw, alloc) = Box::into_raw_with_allocator(self);
@@ -1003,7 +1003,7 @@ impl<T, A: Allocator> Box<[mem::MaybeUninit<T>], A> {
10031003
///
10041004
/// assert_eq!(*values, [1, 2, 3])
10051005
/// ```
1006-
#[stable(feature = "new_uninit", since = "CURRENT_RUSTC_VERSION")]
1006+
#[stable(feature = "new_uninit", since = "1.82.0")]
10071007
#[inline]
10081008
pub unsafe fn assume_init(self) -> Box<[T], A> {
10091009
let (raw, alloc) = Box::into_raw_with_allocator(self);

alloc/src/collections/binary_heap/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1433,7 +1433,7 @@ pub struct Iter<'a, T: 'a> {
14331433
iter: slice::Iter<'a, T>,
14341434
}
14351435

1436-
#[stable(feature = "default_iters_sequel", since = "CURRENT_RUSTC_VERSION")]
1436+
#[stable(feature = "default_iters_sequel", since = "1.82.0")]
14371437
impl<T> Default for Iter<'_, T> {
14381438
/// Creates an empty `binary_heap::Iter`.
14391439
///

alloc/src/collections/btree/map.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2016,7 +2016,7 @@ impl<K, V> Default for Range<'_, K, V> {
20162016
}
20172017
}
20182018

2019-
#[stable(feature = "default_iters_sequel", since = "CURRENT_RUSTC_VERSION")]
2019+
#[stable(feature = "default_iters_sequel", since = "1.82.0")]
20202020
impl<K, V> Default for RangeMut<'_, K, V> {
20212021
/// Creates an empty `btree_map::RangeMut`.
20222022
///
@@ -2064,7 +2064,7 @@ impl<K, V> ExactSizeIterator for ValuesMut<'_, K, V> {
20642064
#[stable(feature = "fused", since = "1.26.0")]
20652065
impl<K, V> FusedIterator for ValuesMut<'_, K, V> {}
20662066

2067-
#[stable(feature = "default_iters_sequel", since = "CURRENT_RUSTC_VERSION")]
2067+
#[stable(feature = "default_iters_sequel", since = "1.82.0")]
20682068
impl<K, V> Default for ValuesMut<'_, K, V> {
20692069
/// Creates an empty `btree_map::ValuesMut`.
20702070
///

alloc/src/collections/vec_deque/into_iter.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,6 @@ impl<T, A: Allocator> Iterator for IntoIter<T, A> {
121121
{
122122
match self.try_fold(init, |b, item| Ok::<B, !>(f(b, item))) {
123123
Ok(b) => b,
124-
#[cfg(bootstrap)]
125-
Err(e) => match e {},
126124
}
127125
}
128126

@@ -243,8 +241,6 @@ impl<T, A: Allocator> DoubleEndedIterator for IntoIter<T, A> {
243241
{
244242
match self.try_rfold(init, |b, item| Ok::<B, !>(f(b, item))) {
245243
Ok(b) => b,
246-
#[cfg(bootstrap)]
247-
Err(e) => match e {},
248244
}
249245
}
250246
}

alloc/src/collections/vec_deque/iter.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ impl<T: fmt::Debug> fmt::Debug for Iter<'_, T> {
2828
}
2929
}
3030

31-
#[stable(feature = "default_iters_sequel", since = "CURRENT_RUSTC_VERSION")]
31+
#[stable(feature = "default_iters_sequel", since = "1.82.0")]
3232
impl<T> Default for Iter<'_, T> {
3333
/// Creates an empty `vec_deque::Iter`.
3434
///

alloc/src/collections/vec_deque/iter_mut.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ impl<T: fmt::Debug> fmt::Debug for IterMut<'_, T> {
2828
}
2929
}
3030

31-
#[stable(feature = "default_iters_sequel", since = "CURRENT_RUSTC_VERSION")]
31+
#[stable(feature = "default_iters_sequel", since = "1.82.0")]
3232
impl<T> Default for IterMut<'_, T> {
3333
/// Creates an empty `vec_deque::IterMut`.
3434
///

alloc/src/rc.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ impl<T> Rc<T> {
517517
/// assert_eq!(*five, 5)
518518
/// ```
519519
#[cfg(not(no_global_oom_handling))]
520-
#[stable(feature = "new_uninit", since = "CURRENT_RUSTC_VERSION")]
520+
#[stable(feature = "new_uninit", since = "1.82.0")]
521521
#[must_use]
522522
pub fn new_uninit() -> Rc<mem::MaybeUninit<T>> {
523523
unsafe {
@@ -980,7 +980,7 @@ impl<T> Rc<[T]> {
980980
/// assert_eq!(*values, [1, 2, 3])
981981
/// ```
982982
#[cfg(not(no_global_oom_handling))]
983-
#[stable(feature = "new_uninit", since = "CURRENT_RUSTC_VERSION")]
983+
#[stable(feature = "new_uninit", since = "1.82.0")]
984984
#[must_use]
985985
pub fn new_uninit_slice(len: usize) -> Rc<[mem::MaybeUninit<T>]> {
986986
unsafe { Rc::from_ptr(Rc::allocate_for_slice(len)) }
@@ -1127,7 +1127,7 @@ impl<T, A: Allocator> Rc<mem::MaybeUninit<T>, A> {
11271127
///
11281128
/// assert_eq!(*five, 5)
11291129
/// ```
1130-
#[stable(feature = "new_uninit", since = "CURRENT_RUSTC_VERSION")]
1130+
#[stable(feature = "new_uninit", since = "1.82.0")]
11311131
#[inline]
11321132
pub unsafe fn assume_init(self) -> Rc<T, A> {
11331133
let (ptr, alloc) = Rc::into_inner_with_allocator(self);
@@ -1167,7 +1167,7 @@ impl<T, A: Allocator> Rc<[mem::MaybeUninit<T>], A> {
11671167
///
11681168
/// assert_eq!(*values, [1, 2, 3])
11691169
/// ```
1170-
#[stable(feature = "new_uninit", since = "CURRENT_RUSTC_VERSION")]
1170+
#[stable(feature = "new_uninit", since = "1.82.0")]
11711171
#[inline]
11721172
pub unsafe fn assume_init(self) -> Rc<[T], A> {
11731173
let (ptr, alloc) = Rc::into_inner_with_allocator(self);

alloc/src/sync.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ impl<T> Arc<T> {
520520
/// ```
521521
#[cfg(not(no_global_oom_handling))]
522522
#[inline]
523-
#[stable(feature = "new_uninit", since = "CURRENT_RUSTC_VERSION")]
523+
#[stable(feature = "new_uninit", since = "1.82.0")]
524524
#[must_use]
525525
pub fn new_uninit() -> Arc<mem::MaybeUninit<T>> {
526526
unsafe {
@@ -1115,7 +1115,7 @@ impl<T> Arc<[T]> {
11151115
/// ```
11161116
#[cfg(not(no_global_oom_handling))]
11171117
#[inline]
1118-
#[stable(feature = "new_uninit", since = "CURRENT_RUSTC_VERSION")]
1118+
#[stable(feature = "new_uninit", since = "1.82.0")]
11191119
#[must_use]
11201120
pub fn new_uninit_slice(len: usize) -> Arc<[mem::MaybeUninit<T>]> {
11211121
unsafe { Arc::from_ptr(Arc::allocate_for_slice(len)) }
@@ -1262,7 +1262,7 @@ impl<T, A: Allocator> Arc<mem::MaybeUninit<T>, A> {
12621262
///
12631263
/// assert_eq!(*five, 5)
12641264
/// ```
1265-
#[stable(feature = "new_uninit", since = "CURRENT_RUSTC_VERSION")]
1265+
#[stable(feature = "new_uninit", since = "1.82.0")]
12661266
#[must_use = "`self` will be dropped if the result is not used"]
12671267
#[inline]
12681268
pub unsafe fn assume_init(self) -> Arc<T, A> {
@@ -1303,7 +1303,7 @@ impl<T, A: Allocator> Arc<[mem::MaybeUninit<T>], A> {
13031303
///
13041304
/// assert_eq!(*values, [1, 2, 3])
13051305
/// ```
1306-
#[stable(feature = "new_uninit", since = "CURRENT_RUSTC_VERSION")]
1306+
#[stable(feature = "new_uninit", since = "1.82.0")]
13071307
#[must_use = "`self` will be dropped if the result is not used"]
13081308
#[inline]
13091309
pub unsafe fn assume_init(self) -> Arc<[T], A> {

core/src/arch.rs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,6 @@
44
#[stable(feature = "simd_arch", since = "1.27.0")]
55
pub use crate::core_arch::arch::*;
66

7-
#[cfg(bootstrap)]
8-
#[allow(dead_code)]
9-
#[unstable(feature = "sha512_sm_x86", issue = "126624")]
10-
fn dummy() {
11-
// AArch64 also has a target feature named `sm4`, so we need `#![feature(sha512_sm_x86)]` in lib.rs
12-
// But as the bootstrap compiler doesn't know about this feature yet, we need to convert it to a
13-
// library feature until bootstrap gets bumped
14-
}
15-
167
/// Inline assembly.
178
///
189
/// Refer to [Rust By Example] for a usage guide and the [reference] for

core/src/cell.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ pub use once::OnceCell;
306306
/// See the [module-level documentation](self) for more.
307307
#[stable(feature = "rust1", since = "1.0.0")]
308308
#[repr(transparent)]
309-
#[cfg_attr(not(bootstrap), rustc_pub_transparent)]
309+
#[rustc_pub_transparent]
310310
pub struct Cell<T: ?Sized> {
311311
value: UnsafeCell<T>,
312312
}
@@ -2056,7 +2056,7 @@ impl<T: ?Sized + fmt::Display> fmt::Display for RefMut<'_, T> {
20562056
#[lang = "unsafe_cell"]
20572057
#[stable(feature = "rust1", since = "1.0.0")]
20582058
#[repr(transparent)]
2059-
#[cfg_attr(not(bootstrap), rustc_pub_transparent)]
2059+
#[rustc_pub_transparent]
20602060
pub struct UnsafeCell<T: ?Sized> {
20612061
value: T,
20622062
}
@@ -2299,7 +2299,7 @@ impl<T> UnsafeCell<*mut T> {
22992299
/// See [`UnsafeCell`] for details.
23002300
#[unstable(feature = "sync_unsafe_cell", issue = "95439")]
23012301
#[repr(transparent)]
2302-
#[cfg_attr(not(bootstrap), rustc_pub_transparent)]
2302+
#[rustc_pub_transparent]
23032303
pub struct SyncUnsafeCell<T: ?Sized> {
23042304
value: UnsafeCell<T>,
23052305
}

0 commit comments

Comments
 (0)