Skip to content

Commit 2e81036

Browse files
committed
Auto merge of #103858 - Mark-Simulacrum:bump-bootstrap, r=pietroalbini
Bump bootstrap compiler to 1.66 This PR: - Bumps version placeholders to release - Bumps to latest beta - cfg-steps code r? `@pietroalbini`
2 parents 6723bf5 + c5edef9 commit 2e81036

File tree

22 files changed

+100
-104
lines changed

22 files changed

+100
-104
lines changed

alloc/src/alloc.rs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,16 @@ extern "Rust" {
2828
// The rustc fork of LLVM 14 and earlier also special-cases these function names to be able to optimize them
2929
// like `malloc`, `realloc`, and `free`, respectively.
3030
#[rustc_allocator]
31-
#[cfg_attr(not(bootstrap), rustc_nounwind)]
32-
#[cfg_attr(bootstrap, rustc_allocator_nounwind)]
31+
#[rustc_nounwind]
3332
fn __rust_alloc(size: usize, align: usize) -> *mut u8;
3433
#[rustc_deallocator]
35-
#[cfg_attr(not(bootstrap), rustc_nounwind)]
36-
#[cfg_attr(bootstrap, rustc_allocator_nounwind)]
34+
#[rustc_nounwind]
3735
fn __rust_dealloc(ptr: *mut u8, size: usize, align: usize);
3836
#[rustc_reallocator]
39-
#[cfg_attr(not(bootstrap), rustc_nounwind)]
40-
#[cfg_attr(bootstrap, rustc_allocator_nounwind)]
37+
#[rustc_nounwind]
4138
fn __rust_realloc(ptr: *mut u8, old_size: usize, align: usize, new_size: usize) -> *mut u8;
4239
#[rustc_allocator_zeroed]
43-
#[cfg_attr(not(bootstrap), rustc_nounwind)]
44-
#[cfg_attr(bootstrap, rustc_allocator_nounwind)]
40+
#[rustc_nounwind]
4541
fn __rust_alloc_zeroed(size: usize, align: usize) -> *mut u8;
4642
}
4743

alloc/src/boxed.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1661,7 +1661,7 @@ impl<T, const N: usize> TryFrom<Box<[T]>> for Box<[T; N]> {
16611661
}
16621662

16631663
#[cfg(not(no_global_oom_handling))]
1664-
#[stable(feature = "boxed_array_try_from_vec", since = "CURRENT_RUSTC_VERSION")]
1664+
#[stable(feature = "boxed_array_try_from_vec", since = "1.66.0")]
16651665
impl<T, const N: usize> TryFrom<Vec<T>> for Box<[T; N]> {
16661666
type Error = Vec<T>;
16671667

alloc/src/collections/btree/map.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ impl<K, V> BTreeMap<K, V> {
580580
/// map.insert(1, "a");
581581
/// ```
582582
#[stable(feature = "rust1", since = "1.0.0")]
583-
#[rustc_const_stable(feature = "const_btree_new", since = "CURRENT_RUSTC_VERSION")]
583+
#[rustc_const_stable(feature = "const_btree_new", since = "1.66.0")]
584584
#[must_use]
585585
pub const fn new() -> BTreeMap<K, V> {
586586
BTreeMap { root: None, length: 0, alloc: ManuallyDrop::new(Global), _marker: PhantomData }
@@ -711,7 +711,7 @@ impl<K, V, A: Allocator + Clone> BTreeMap<K, V, A> {
711711
/// map.insert(2, "a");
712712
/// assert_eq!(map.first_key_value(), Some((&1, &"b")));
713713
/// ```
714-
#[stable(feature = "map_first_last", since = "CURRENT_RUSTC_VERSION")]
714+
#[stable(feature = "map_first_last", since = "1.66.0")]
715715
pub fn first_key_value(&self) -> Option<(&K, &V)>
716716
where
717717
K: Ord,
@@ -739,7 +739,7 @@ impl<K, V, A: Allocator + Clone> BTreeMap<K, V, A> {
739739
/// assert_eq!(*map.get(&1).unwrap(), "first");
740740
/// assert_eq!(*map.get(&2).unwrap(), "b");
741741
/// ```
742-
#[stable(feature = "map_first_last", since = "CURRENT_RUSTC_VERSION")]
742+
#[stable(feature = "map_first_last", since = "1.66.0")]
743743
pub fn first_entry(&mut self) -> Option<OccupiedEntry<'_, K, V, A>>
744744
where
745745
K: Ord,
@@ -773,7 +773,7 @@ impl<K, V, A: Allocator + Clone> BTreeMap<K, V, A> {
773773
/// }
774774
/// assert!(map.is_empty());
775775
/// ```
776-
#[stable(feature = "map_first_last", since = "CURRENT_RUSTC_VERSION")]
776+
#[stable(feature = "map_first_last", since = "1.66.0")]
777777
pub fn pop_first(&mut self) -> Option<(K, V)>
778778
where
779779
K: Ord,
@@ -796,7 +796,7 @@ impl<K, V, A: Allocator + Clone> BTreeMap<K, V, A> {
796796
/// map.insert(2, "a");
797797
/// assert_eq!(map.last_key_value(), Some((&2, &"a")));
798798
/// ```
799-
#[stable(feature = "map_first_last", since = "CURRENT_RUSTC_VERSION")]
799+
#[stable(feature = "map_first_last", since = "1.66.0")]
800800
pub fn last_key_value(&self) -> Option<(&K, &V)>
801801
where
802802
K: Ord,
@@ -824,7 +824,7 @@ impl<K, V, A: Allocator + Clone> BTreeMap<K, V, A> {
824824
/// assert_eq!(*map.get(&1).unwrap(), "a");
825825
/// assert_eq!(*map.get(&2).unwrap(), "last");
826826
/// ```
827-
#[stable(feature = "map_first_last", since = "CURRENT_RUSTC_VERSION")]
827+
#[stable(feature = "map_first_last", since = "1.66.0")]
828828
pub fn last_entry(&mut self) -> Option<OccupiedEntry<'_, K, V, A>>
829829
where
830830
K: Ord,
@@ -858,7 +858,7 @@ impl<K, V, A: Allocator + Clone> BTreeMap<K, V, A> {
858858
/// }
859859
/// assert!(map.is_empty());
860860
/// ```
861-
#[stable(feature = "map_first_last", since = "CURRENT_RUSTC_VERSION")]
861+
#[stable(feature = "map_first_last", since = "1.66.0")]
862862
pub fn pop_last(&mut self) -> Option<(K, V)>
863863
where
864864
K: Ord,

alloc/src/collections/btree/set.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ impl<T> BTreeSet<T> {
343343
/// let mut set: BTreeSet<i32> = BTreeSet::new();
344344
/// ```
345345
#[stable(feature = "rust1", since = "1.0.0")]
346-
#[rustc_const_stable(feature = "const_btree_new", since = "CURRENT_RUSTC_VERSION")]
346+
#[rustc_const_stable(feature = "const_btree_new", since = "1.66.0")]
347347
#[must_use]
348348
pub const fn new() -> BTreeSet<T> {
349349
BTreeSet { map: BTreeMap::new() }
@@ -796,7 +796,7 @@ impl<T, A: Allocator + Clone> BTreeSet<T, A> {
796796
/// assert_eq!(set.first(), Some(&1));
797797
/// ```
798798
#[must_use]
799-
#[stable(feature = "map_first_last", since = "CURRENT_RUSTC_VERSION")]
799+
#[stable(feature = "map_first_last", since = "1.66.0")]
800800
pub fn first(&self) -> Option<&T>
801801
where
802802
T: Ord,
@@ -822,7 +822,7 @@ impl<T, A: Allocator + Clone> BTreeSet<T, A> {
822822
/// assert_eq!(set.last(), Some(&2));
823823
/// ```
824824
#[must_use]
825-
#[stable(feature = "map_first_last", since = "CURRENT_RUSTC_VERSION")]
825+
#[stable(feature = "map_first_last", since = "1.66.0")]
826826
pub fn last(&self) -> Option<&T>
827827
where
828828
T: Ord,
@@ -846,7 +846,7 @@ impl<T, A: Allocator + Clone> BTreeSet<T, A> {
846846
/// }
847847
/// assert!(set.is_empty());
848848
/// ```
849-
#[stable(feature = "map_first_last", since = "CURRENT_RUSTC_VERSION")]
849+
#[stable(feature = "map_first_last", since = "1.66.0")]
850850
pub fn pop_first(&mut self) -> Option<T>
851851
where
852852
T: Ord,
@@ -870,7 +870,7 @@ impl<T, A: Allocator + Clone> BTreeSet<T, A> {
870870
/// }
871871
/// assert!(set.is_empty());
872872
/// ```
873-
#[stable(feature = "map_first_last", since = "CURRENT_RUSTC_VERSION")]
873+
#[stable(feature = "map_first_last", since = "1.66.0")]
874874
pub fn pop_last(&mut self) -> Option<T>
875875
where
876876
T: Ord,

core/src/default.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
/// ```
100100
#[cfg_attr(not(test), rustc_diagnostic_item = "Default")]
101101
#[stable(feature = "rust1", since = "1.0.0")]
102-
#[cfg_attr(not(bootstrap), const_trait)]
102+
#[const_trait]
103103
pub trait Default: Sized {
104104
/// Returns the "default value" for a type.
105105
///

core/src/error.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ impl Error for crate::char::ParseCharError {
493493
}
494494
}
495495

496-
#[stable(feature = "duration_checked_float", since = "CURRENT_RUSTC_VERSION")]
496+
#[stable(feature = "duration_checked_float", since = "1.66.0")]
497497
impl Error for crate::time::TryFromFloatSecsError {}
498498

499499
#[stable(feature = "frombyteswithnulerror_impls", since = "1.17.0")]

core/src/hint.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ pub fn spin_loop() {
220220
///
221221
/// [`std::convert::identity`]: crate::convert::identity
222222
#[inline]
223-
#[stable(feature = "bench_black_box", since = "CURRENT_RUSTC_VERSION")]
223+
#[stable(feature = "bench_black_box", since = "1.66.0")]
224224
#[rustc_const_unstable(feature = "const_black_box", issue = "none")]
225225
pub const fn black_box<T>(dummy: T) -> T {
226226
crate::intrinsics::black_box(dummy)

0 commit comments

Comments
 (0)