Skip to content

Commit dfaaa1b

Browse files
authored
Rollup merge of #148226 - cuviper:bootstrap-update, r=Mark-Simulacrum
Bootstrap update - Update CURRENT_RUSTC_VERSION post-bump - Bump stage0 to 1.92.0-beta.1 - Update `#[cfg(bootstrap)]`
2 parents e546800 + 8fd2dc0 commit dfaaa1b

File tree

16 files changed

+543
-548
lines changed

16 files changed

+543
-548
lines changed

compiler/rustc_feature/src/removed.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,9 @@ declare_features! (
102102
/// Allows deriving traits as per `SmartPointer` specification
103103
(removed, derive_smart_pointer, "1.84.0", Some(123430), Some("replaced by `CoercePointee`"), 131284),
104104
/// Tells rustdoc to automatically generate `#[doc(cfg(...))]`.
105-
(removed, doc_auto_cfg, "CURRENT_RUSTC_VERSION", Some(43781), Some("merged into `doc_cfg`"), 138907),
105+
(removed, doc_auto_cfg, "1.92.0", Some(43781), Some("merged into `doc_cfg`"), 138907),
106106
/// Allows `#[doc(cfg_hide(...))]`.
107-
(removed, doc_cfg_hide, "CURRENT_RUSTC_VERSION", Some(43781), Some("merged into `doc_cfg`"), 138907),
107+
(removed, doc_cfg_hide, "1.92.0", Some(43781), Some("merged into `doc_cfg`"), 138907),
108108
/// Allows using `#[doc(keyword = "...")]`.
109109
(removed, doc_keyword, "1.58.0", Some(51315),
110110
Some("merged into `#![feature(rustdoc_internals)]`"), 90420),

compiler/rustc_index/src/idx.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ impl<I: Idx, T> IntoSliceIdx<I, [T]> for core::range::RangeInclusive<I> {
135135
}
136136
}
137137

138-
#[cfg(all(feature = "nightly", not(bootstrap)))]
138+
#[cfg(feature = "nightly")]
139139
impl<I: Idx, T> IntoSliceIdx<I, [T]> for core::range::RangeToInclusive<I> {
140140
type Output = core::range::RangeToInclusive<usize>;
141141
#[inline]

compiler/rustc_index/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// tidy-alphabetical-start
22
#![cfg_attr(all(feature = "nightly", test), feature(stmt_expr_attributes))]
3-
#![cfg_attr(bootstrap, feature(new_zeroed_alloc))]
43
#![cfg_attr(feature = "nightly", allow(internal_features))]
54
#![cfg_attr(feature = "nightly", feature(extend_one, step_trait, test))]
65
#![cfg_attr(feature = "nightly", feature(new_range_api))]

library/alloc/src/boxed.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ impl<T> Box<T> {
300300
/// [zeroed]: mem::MaybeUninit::zeroed
301301
#[cfg(not(no_global_oom_handling))]
302302
#[inline]
303-
#[stable(feature = "new_zeroed_alloc", since = "CURRENT_RUSTC_VERSION")]
303+
#[stable(feature = "new_zeroed_alloc", since = "1.92.0")]
304304
#[must_use]
305305
pub fn new_zeroed() -> Box<mem::MaybeUninit<T>> {
306306
Self::new_zeroed_in(Global)
@@ -692,7 +692,7 @@ impl<T> Box<[T]> {
692692
///
693693
/// [zeroed]: mem::MaybeUninit::zeroed
694694
#[cfg(not(no_global_oom_handling))]
695-
#[stable(feature = "new_zeroed_alloc", since = "CURRENT_RUSTC_VERSION")]
695+
#[stable(feature = "new_zeroed_alloc", since = "1.92.0")]
696696
#[must_use]
697697
pub fn new_zeroed_slice(len: usize) -> Box<[mem::MaybeUninit<T>]> {
698698
unsafe { RawVec::with_capacity_zeroed(len).into_box(len) }

library/alloc/src/collections/btree/map/entry.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ impl<'a, K: Ord, V, A: Allocator + Clone> Entry<'a, K, V, A> {
284284
/// assert_eq!(entry.key(), &"poneyland");
285285
/// ```
286286
#[inline]
287-
#[stable(feature = "btree_entry_insert", since = "CURRENT_RUSTC_VERSION")]
287+
#[stable(feature = "btree_entry_insert", since = "1.92.0")]
288288
pub fn insert_entry(self, value: V) -> OccupiedEntry<'a, K, V, A> {
289289
match self {
290290
Occupied(mut entry) => {
@@ -394,7 +394,7 @@ impl<'a, K: Ord, V, A: Allocator + Clone> VacantEntry<'a, K, V, A> {
394394
/// }
395395
/// assert_eq!(map["poneyland"], 37);
396396
/// ```
397-
#[stable(feature = "btree_entry_insert", since = "CURRENT_RUSTC_VERSION")]
397+
#[stable(feature = "btree_entry_insert", since = "1.92.0")]
398398
pub fn insert_entry(mut self, value: V) -> OccupiedEntry<'a, K, V, A> {
399399
let handle = match self.handle {
400400
None => {

library/alloc/src/rc.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@ impl<T> Rc<T> {
529529
///
530530
/// [zeroed]: mem::MaybeUninit::zeroed
531531
#[cfg(not(no_global_oom_handling))]
532-
#[stable(feature = "new_zeroed_alloc", since = "CURRENT_RUSTC_VERSION")]
532+
#[stable(feature = "new_zeroed_alloc", since = "1.92.0")]
533533
#[must_use]
534534
pub fn new_zeroed() -> Rc<mem::MaybeUninit<T>> {
535535
unsafe {
@@ -1057,7 +1057,7 @@ impl<T> Rc<[T]> {
10571057
///
10581058
/// [zeroed]: mem::MaybeUninit::zeroed
10591059
#[cfg(not(no_global_oom_handling))]
1060-
#[stable(feature = "new_zeroed_alloc", since = "CURRENT_RUSTC_VERSION")]
1060+
#[stable(feature = "new_zeroed_alloc", since = "1.92.0")]
10611061
#[must_use]
10621062
pub fn new_zeroed_slice(len: usize) -> Rc<[mem::MaybeUninit<T>]> {
10631063
unsafe {

library/alloc/src/sync.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ impl<T> Arc<T> {
536536
/// [zeroed]: mem::MaybeUninit::zeroed
537537
#[cfg(not(no_global_oom_handling))]
538538
#[inline]
539-
#[stable(feature = "new_zeroed_alloc", since = "CURRENT_RUSTC_VERSION")]
539+
#[stable(feature = "new_zeroed_alloc", since = "1.92.0")]
540540
#[must_use]
541541
pub fn new_zeroed() -> Arc<mem::MaybeUninit<T>> {
542542
unsafe {
@@ -1205,7 +1205,7 @@ impl<T> Arc<[T]> {
12051205
/// [zeroed]: mem::MaybeUninit::zeroed
12061206
#[cfg(not(no_global_oom_handling))]
12071207
#[inline]
1208-
#[stable(feature = "new_zeroed_alloc", since = "CURRENT_RUSTC_VERSION")]
1208+
#[stable(feature = "new_zeroed_alloc", since = "1.92.0")]
12091209
#[must_use]
12101210
pub fn new_zeroed_slice(len: usize) -> Arc<[mem::MaybeUninit<T>]> {
12111211
unsafe {

library/core/src/num/nonzero.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1382,11 +1382,8 @@ macro_rules! nonzero_integer_signedness_dependent_impls {
13821382
#[doc = concat!("let three = NonZero::new(3", stringify!($Int), ").unwrap();")]
13831383
/// assert_eq!(three.div_ceil(two), two);
13841384
/// ```
1385-
#[stable(feature = "unsigned_nonzero_div_ceil", since = "CURRENT_RUSTC_VERSION")]
1386-
#[rustc_const_stable(
1387-
feature = "unsigned_nonzero_div_ceil",
1388-
since = "CURRENT_RUSTC_VERSION"
1389-
)]
1385+
#[stable(feature = "unsigned_nonzero_div_ceil", since = "1.92.0")]
1386+
#[rustc_const_stable(feature = "unsigned_nonzero_div_ceil", since = "1.92.0")]
13901387
#[must_use = "this returns the result of the operation, \
13911388
without modifying the original"]
13921389
#[inline]

library/core/src/panic/location.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ impl<'a> Location<'a> {
194194
/// `std::source_location::file_name`, both of which return a nul-terminated `const char*`.
195195
#[must_use]
196196
#[inline]
197-
#[stable(feature = "file_with_nul", since = "CURRENT_RUSTC_VERSION")]
198-
#[rustc_const_stable(feature = "file_with_nul", since = "CURRENT_RUSTC_VERSION")]
197+
#[stable(feature = "file_with_nul", since = "1.92.0")]
198+
#[rustc_const_stable(feature = "file_with_nul", since = "1.92.0")]
199199
pub const fn file_as_c_str(&self) -> &'a CStr {
200200
let filename = self.filename.as_ptr();
201201

library/core/src/slice/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3629,7 +3629,7 @@ impl<T> [T] {
36293629
/// assert_eq!(a, ['a', 'c', 'd', 'e', 'b', 'f']);
36303630
/// ```
36313631
#[stable(feature = "slice_rotate", since = "1.26.0")]
3632-
#[rustc_const_stable(feature = "const_slice_rotate", since = "CURRENT_RUSTC_VERSION")]
3632+
#[rustc_const_stable(feature = "const_slice_rotate", since = "1.92.0")]
36333633
pub const fn rotate_left(&mut self, mid: usize) {
36343634
assert!(mid <= self.len());
36353635
let k = self.len() - mid;
@@ -3675,7 +3675,7 @@ impl<T> [T] {
36753675
/// assert_eq!(a, ['a', 'e', 'b', 'c', 'd', 'f']);
36763676
/// ```
36773677
#[stable(feature = "slice_rotate", since = "1.26.0")]
3678-
#[rustc_const_stable(feature = "const_slice_rotate", since = "CURRENT_RUSTC_VERSION")]
3678+
#[rustc_const_stable(feature = "const_slice_rotate", since = "1.92.0")]
36793679
pub const fn rotate_right(&mut self, k: usize) {
36803680
assert!(k <= self.len());
36813681
let mid = self.len() - k;

0 commit comments

Comments
 (0)