Skip to content

Commit 4f47132

Browse files
borsbors
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 fd0bc94 + 349f8d5 commit 4f47132

39 files changed

+77
-140
lines changed

Diff for: ‎alloc/src/boxed.rs

+4-4
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);

Diff for: ‎alloc/src/collections/binary_heap/mod.rs

+1-1
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
///

Diff for: ‎alloc/src/collections/btree/map.rs

+2-2
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
///

Diff for: ‎alloc/src/collections/vec_deque/into_iter.rs

-4
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
}

Diff for: ‎alloc/src/collections/vec_deque/iter.rs

+1-1
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
///

Diff for: ‎alloc/src/collections/vec_deque/iter_mut.rs

+1-1
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
///

Diff for: ‎alloc/src/rc.rs

+4-4
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);

Diff for: ‎alloc/src/sync.rs

+4-4
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> {

Diff for: ‎core/src/arch.rs

-9
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

Diff for: ‎core/src/cell.rs

+3-3
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
}

Diff for: ‎core/src/clone.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ pub trait Clone: Sized {
161161
#[must_use = "cloning is often expensive and is not expected to have side effects"]
162162
// Clone::clone is special because the compiler generates MIR to implement it for some types.
163163
// See InstanceKind::CloneShim.
164-
#[cfg_attr(not(bootstrap), lang = "clone_fn")]
164+
#[lang = "clone_fn"]
165165
fn clone(&self) -> Self;
166166

167167
/// Performs copy-assignment from `source`.

Diff for: ‎core/src/default.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ use crate::ascii::Char as AsciiChar;
103103
/// ```
104104
#[cfg_attr(not(test), rustc_diagnostic_item = "Default")]
105105
#[stable(feature = "rust1", since = "1.0.0")]
106-
#[cfg_attr(not(bootstrap), rustc_trivial_field_reads)]
106+
#[rustc_trivial_field_reads]
107107
pub trait Default: Sized {
108108
/// Returns the "default value" for a type.
109109
///

Diff for: ‎core/src/future/ready.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ impl<T> Ready<T> {
3939
/// let a = future::ready(1);
4040
/// assert_eq!(a.into_inner(), 1);
4141
/// ```
42-
#[stable(feature = "ready_into_inner", since = "CURRENT_RUSTC_VERSION")]
42+
#[stable(feature = "ready_into_inner", since = "1.82.0")]
4343
#[must_use]
4444
#[inline]
4545
pub fn into_inner(self) -> T {

Diff for: ‎core/src/intrinsics.rs

-7
Original file line numberDiff line numberDiff line change
@@ -1020,7 +1020,6 @@ pub const fn unlikely(b: bool) -> bool {
10201020
/// any safety invariants.
10211021
///
10221022
/// This intrinsic does not have a stable counterpart.
1023-
#[cfg(not(bootstrap))]
10241023
#[unstable(feature = "core_intrinsics", issue = "none")]
10251024
#[rustc_intrinsic]
10261025
#[rustc_nounwind]
@@ -1030,12 +1029,6 @@ pub fn select_unpredictable<T>(b: bool, true_val: T, false_val: T) -> T {
10301029
if b { true_val } else { false_val }
10311030
}
10321031

1033-
#[cfg(bootstrap)]
1034-
#[inline]
1035-
pub fn select_unpredictable<T>(b: bool, true_val: T, false_val: T) -> T {
1036-
if b { true_val } else { false_val }
1037-
}
1038-
10391032
extern "rust-intrinsic" {
10401033
/// Executes a breakpoint trap, for inspection by a debugger.
10411034
///

Diff for: ‎core/src/iter/adapters/take.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ impl<I: Iterator + TrustedRandomAccess> SpecTake for Take<I> {
318318
}
319319
}
320320

321-
#[stable(feature = "exact_size_take_repeat", since = "CURRENT_RUSTC_VERSION")]
321+
#[stable(feature = "exact_size_take_repeat", since = "1.82.0")]
322322
impl<T: Clone> DoubleEndedIterator for Take<crate::iter::Repeat<T>> {
323323
#[inline]
324324
fn next_back(&mut self) -> Option<Self::Item> {
@@ -361,14 +361,14 @@ impl<T: Clone> DoubleEndedIterator for Take<crate::iter::Repeat<T>> {
361361
// because we have no way to return value of nth invocation of repeater followed
362362
// by n-1st without remembering all results.
363363

364-
#[stable(feature = "exact_size_take_repeat", since = "CURRENT_RUSTC_VERSION")]
364+
#[stable(feature = "exact_size_take_repeat", since = "1.82.0")]
365365
impl<T: Clone> ExactSizeIterator for Take<crate::iter::Repeat<T>> {
366366
fn len(&self) -> usize {
367367
self.n
368368
}
369369
}
370370

371-
#[stable(feature = "exact_size_take_repeat", since = "CURRENT_RUSTC_VERSION")]
371+
#[stable(feature = "exact_size_take_repeat", since = "1.82.0")]
372372
impl<F: FnMut() -> A, A> ExactSizeIterator for Take<crate::iter::RepeatWith<F>> {
373373
fn len(&self) -> usize {
374374
self.n

Diff for: ‎core/src/iter/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ pub use self::sources::{once, Once};
436436
pub use self::sources::{once_with, OnceWith};
437437
#[stable(feature = "rust1", since = "1.0.0")]
438438
pub use self::sources::{repeat, Repeat};
439-
#[stable(feature = "iter_repeat_n", since = "CURRENT_RUSTC_VERSION")]
439+
#[stable(feature = "iter_repeat_n", since = "1.82.0")]
440440
pub use self::sources::{repeat_n, RepeatN};
441441
#[stable(feature = "iterator_repeat_with", since = "1.28.0")]
442442
pub use self::sources::{repeat_with, RepeatWith};

Diff for: ‎core/src/iter/sources.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub use self::once::{once, Once};
2424
pub use self::once_with::{once_with, OnceWith};
2525
#[stable(feature = "rust1", since = "1.0.0")]
2626
pub use self::repeat::{repeat, Repeat};
27-
#[stable(feature = "iter_repeat_n", since = "CURRENT_RUSTC_VERSION")]
27+
#[stable(feature = "iter_repeat_n", since = "1.82.0")]
2828
pub use self::repeat_n::{repeat_n, RepeatN};
2929
#[stable(feature = "iterator_repeat_with", since = "1.28.0")]
3030
pub use self::repeat_with::{repeat_with, RepeatWith};

Diff for: ‎core/src/iter/sources/repeat_n.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ use crate::num::NonZero;
5656
/// assert_eq!(None, it.next());
5757
/// ```
5858
#[inline]
59-
#[stable(feature = "iter_repeat_n", since = "CURRENT_RUSTC_VERSION")]
59+
#[stable(feature = "iter_repeat_n", since = "1.82.0")]
6060
pub fn repeat_n<T: Clone>(element: T, count: usize) -> RepeatN<T> {
6161
let mut element = ManuallyDrop::new(element);
6262

@@ -75,7 +75,7 @@ pub fn repeat_n<T: Clone>(element: T, count: usize) -> RepeatN<T> {
7575
/// This `struct` is created by the [`repeat_n()`] function.
7676
/// See its documentation for more.
7777
#[derive(Clone, Debug)]
78-
#[stable(feature = "iter_repeat_n", since = "CURRENT_RUSTC_VERSION")]
78+
#[stable(feature = "iter_repeat_n", since = "1.82.0")]
7979
pub struct RepeatN<A> {
8080
count: usize,
8181
// Invariant: has been dropped iff count == 0.
@@ -99,14 +99,14 @@ impl<A> RepeatN<A> {
9999
}
100100
}
101101

102-
#[stable(feature = "iter_repeat_n", since = "CURRENT_RUSTC_VERSION")]
102+
#[stable(feature = "iter_repeat_n", since = "1.82.0")]
103103
impl<A> Drop for RepeatN<A> {
104104
fn drop(&mut self) {
105105
self.take_element();
106106
}
107107
}
108108

109-
#[stable(feature = "iter_repeat_n", since = "CURRENT_RUSTC_VERSION")]
109+
#[stable(feature = "iter_repeat_n", since = "1.82.0")]
110110
impl<A: Clone> Iterator for RepeatN<A> {
111111
type Item = A;
112112

@@ -154,14 +154,14 @@ impl<A: Clone> Iterator for RepeatN<A> {
154154
}
155155
}
156156

157-
#[stable(feature = "iter_repeat_n", since = "CURRENT_RUSTC_VERSION")]
157+
#[stable(feature = "iter_repeat_n", since = "1.82.0")]
158158
impl<A: Clone> ExactSizeIterator for RepeatN<A> {
159159
fn len(&self) -> usize {
160160
self.count
161161
}
162162
}
163163

164-
#[stable(feature = "iter_repeat_n", since = "CURRENT_RUSTC_VERSION")]
164+
#[stable(feature = "iter_repeat_n", since = "1.82.0")]
165165
impl<A: Clone> DoubleEndedIterator for RepeatN<A> {
166166
#[inline]
167167
fn next_back(&mut self) -> Option<A> {
@@ -179,12 +179,12 @@ impl<A: Clone> DoubleEndedIterator for RepeatN<A> {
179179
}
180180
}
181181

182-
#[stable(feature = "iter_repeat_n", since = "CURRENT_RUSTC_VERSION")]
182+
#[stable(feature = "iter_repeat_n", since = "1.82.0")]
183183
impl<A: Clone> FusedIterator for RepeatN<A> {}
184184

185185
#[unstable(feature = "trusted_len", issue = "37572")]
186186
unsafe impl<A: Clone> TrustedLen for RepeatN<A> {}
187-
#[stable(feature = "iter_repeat_n", since = "CURRENT_RUSTC_VERSION")]
187+
#[stable(feature = "iter_repeat_n", since = "1.82.0")]
188188
impl<A: Clone> UncheckedIterator for RepeatN<A> {
189189
#[inline]
190190
unsafe fn next_unchecked(&mut self) -> Self::Item {

Diff for: ‎core/src/iter/traits/iterator.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -3953,7 +3953,7 @@ pub trait Iterator {
39533953
/// assert!(![0.0, 1.0, f32::NAN].iter().is_sorted());
39543954
/// ```
39553955
#[inline]
3956-
#[stable(feature = "is_sorted", since = "CURRENT_RUSTC_VERSION")]
3956+
#[stable(feature = "is_sorted", since = "1.82.0")]
39573957
#[rustc_do_not_const_check]
39583958
fn is_sorted(self) -> bool
39593959
where
@@ -3980,7 +3980,7 @@ pub trait Iterator {
39803980
/// assert!(std::iter::empty::<i32>().is_sorted_by(|a, b| false));
39813981
/// assert!(std::iter::empty::<i32>().is_sorted_by(|a, b| true));
39823982
/// ```
3983-
#[stable(feature = "is_sorted", since = "CURRENT_RUSTC_VERSION")]
3983+
#[stable(feature = "is_sorted", since = "1.82.0")]
39843984
#[rustc_do_not_const_check]
39853985
fn is_sorted_by<F>(mut self, compare: F) -> bool
39863986
where
@@ -4025,7 +4025,7 @@ pub trait Iterator {
40254025
/// assert!(![-2i32, -1, 0, 3].iter().is_sorted_by_key(|n| n.abs()));
40264026
/// ```
40274027
#[inline]
4028-
#[stable(feature = "is_sorted", since = "CURRENT_RUSTC_VERSION")]
4028+
#[stable(feature = "is_sorted", since = "1.82.0")]
40294029
#[rustc_do_not_const_check]
40304030
fn is_sorted_by_key<F, K>(self, f: F) -> bool
40314031
where

0 commit comments

Comments
 (0)