Skip to content

Commit c25ac9d

Browse files
committed
Auto merge of rust-lang#126273 - pietroalbini:pa-bootstrap-update, r=Mark-Simulacrum
Bump stage0 to 1.80.0 r? `@Mark-Simulacrum`
2 parents 1d43fbb + 48e614a commit c25ac9d

File tree

43 files changed

+580
-654
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+580
-654
lines changed

compiler/rustc_feature/src/accepted.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ declare_features! (
139139
/// Allows `crate` in paths.
140140
(accepted, crate_in_paths, "1.30.0", Some(45477)),
141141
/// Allows users to provide classes for fenced code block using `class:classname`.
142-
(accepted, custom_code_classes_in_docs, "CURRENT_RUSTC_VERSION", Some(79483)),
142+
(accepted, custom_code_classes_in_docs, "1.80.0", Some(79483)),
143143
/// Allows using `#[debugger_visualizer]` attribute.
144144
(accepted, debugger_visualizer, "1.71.0", Some(95939)),
145145
/// Allows rustc to inject a default alloc_error_handler
@@ -165,7 +165,7 @@ declare_features! (
165165
/// Allows using `dyn Trait` as a syntax for trait objects.
166166
(accepted, dyn_trait, "1.27.0", Some(44662)),
167167
/// Allows `X..Y` patterns.
168-
(accepted, exclusive_range_pattern, "CURRENT_RUSTC_VERSION", Some(37854)),
168+
(accepted, exclusive_range_pattern, "1.80.0", Some(37854)),
169169
/// Allows integer match exhaustiveness checking (RFC 2591).
170170
(accepted, exhaustive_integer_patterns, "1.33.0", Some(50907)),
171171
/// Allows explicit generic arguments specification with `impl Trait` present.

compiler/rustc_feature/src/unstable.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ declare_features! (
457457
/// Allows explicit tail calls via `become` expression.
458458
(incomplete, explicit_tail_calls, "1.72.0", Some(112788)),
459459
/// Uses 2024 rules for matching `expr` fragments in macros. Also enables `expr_2021` fragment.
460-
(incomplete, expr_fragment_specifier_2024, "CURRENT_RUSTC_VERSION", Some(123742)),
460+
(incomplete, expr_fragment_specifier_2024, "1.80.0", Some(123742)),
461461
/// Allows using `efiapi`, `sysv64` and `win64` as calling convention
462462
/// for functions with varargs.
463463
(unstable, extended_varargs_abi_support, "1.65.0", Some(100189)),
@@ -488,7 +488,7 @@ declare_features! (
488488
/// Allows generic parameters and where-clauses on free & associated const items.
489489
(incomplete, generic_const_items, "1.73.0", Some(113521)),
490490
/// Allows registering static items globally, possibly across crates, to iterate over at runtime.
491-
(unstable, global_registration, "CURRENT_RUSTC_VERSION", Some(125119)),
491+
(unstable, global_registration, "1.80.0", Some(125119)),
492492
/// Allows using `..=X` as a patterns in slices.
493493
(unstable, half_open_range_patterns_in_slices, "1.66.0", Some(67264)),
494494
/// Allows `if let` guard in match arms.
@@ -581,7 +581,7 @@ declare_features! (
581581
(unstable, repr_simd, "1.4.0", Some(27731)),
582582
/// Allows enums like Result<T, E> to be used across FFI, if T's niche value can
583583
/// be used to describe E or vise-versa.
584-
(unstable, result_ffi_guarantees, "CURRENT_RUSTC_VERSION", Some(110503)),
584+
(unstable, result_ffi_guarantees, "1.80.0", Some(110503)),
585585
/// Allows bounding the return type of AFIT/RPITIT.
586586
(incomplete, return_type_notation, "1.70.0", Some(109417)),
587587
/// Allows `extern "rust-cold"`.
@@ -623,9 +623,9 @@ declare_features! (
623623
/// Allows unnamed fields of struct and union type
624624
(incomplete, unnamed_fields, "1.74.0", Some(49804)),
625625
/// Allows unsafe attributes.
626-
(unstable, unsafe_attributes, "CURRENT_RUSTC_VERSION", Some(123757)),
626+
(unstable, unsafe_attributes, "1.80.0", Some(123757)),
627627
/// Allows unsafe on extern declarations and safety qualifiers over internal items.
628-
(unstable, unsafe_extern_blocks, "CURRENT_RUSTC_VERSION", Some(123743)),
628+
(unstable, unsafe_extern_blocks, "1.80.0", Some(123743)),
629629
/// Allows unsized fn parameters.
630630
(unstable, unsized_fn_params, "1.49.0", Some(48055)),
631631
/// Allows unsized rvalues at arguments and parameters.

compiler/rustc_lint/src/shadowed_into_iter.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ declare_lint! {
4949
///
5050
/// ### Explanation
5151
///
52-
/// Since Rust CURRENT_RUSTC_VERSION, boxed slices implement `IntoIterator`. However, to avoid
52+
/// Since Rust 1.80.0, boxed slices implement `IntoIterator`. However, to avoid
5353
/// breakage, `boxed_slice.into_iter()` in Rust 2015, 2018, and 2021 code will still
5454
/// behave as `(&boxed_slice).into_iter()`, returning an iterator over
55-
/// references, just like in Rust CURRENT_RUSTC_VERSION and earlier.
55+
/// references, just like in Rust 1.80.0 and earlier.
5656
/// This only applies to the method call syntax `boxed_slice.into_iter()`, not to
5757
/// any other syntax such as `for _ in boxed_slice` or `IntoIterator::into_iter(boxed_slice)`.
5858
pub BOXED_SLICE_INTO_ITER,

library/alloc/src/boxed.rs

+13-14
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,7 @@
145145
//! to `into_iter()` for boxed slices will defer to the slice implementation on editions before
146146
//! 2024:
147147
//!
148-
#![cfg_attr(bootstrap, doc = "```rust,edition2021,ignore")]
149-
#![cfg_attr(not(bootstrap), doc = "```rust,edition2021")]
148+
//! ```rust,edition2021
150149
//! // Rust 2015, 2018, and 2021:
151150
//!
152151
//! # #![allow(boxed_slice_into_iter)] // override our `deny(warnings)`
@@ -2123,23 +2122,23 @@ impl<I> FromIterator<I> for Box<[I]> {
21232122

21242123
/// This implementation is required to make sure that the `Box<[I]>: IntoIterator`
21252124
/// implementation doesn't overlap with `IntoIterator for T where T: Iterator` blanket.
2126-
#[stable(feature = "boxed_slice_into_iter", since = "CURRENT_RUSTC_VERSION")]
2125+
#[stable(feature = "boxed_slice_into_iter", since = "1.80.0")]
21272126
impl<I, A: Allocator> !Iterator for Box<[I], A> {}
21282127

21292128
/// This implementation is required to make sure that the `&Box<[I]>: IntoIterator`
21302129
/// implementation doesn't overlap with `IntoIterator for T where T: Iterator` blanket.
2131-
#[stable(feature = "boxed_slice_into_iter", since = "CURRENT_RUSTC_VERSION")]
2130+
#[stable(feature = "boxed_slice_into_iter", since = "1.80.0")]
21322131
impl<'a, I, A: Allocator> !Iterator for &'a Box<[I], A> {}
21332132

21342133
/// This implementation is required to make sure that the `&mut Box<[I]>: IntoIterator`
21352134
/// implementation doesn't overlap with `IntoIterator for T where T: Iterator` blanket.
2136-
#[stable(feature = "boxed_slice_into_iter", since = "CURRENT_RUSTC_VERSION")]
2135+
#[stable(feature = "boxed_slice_into_iter", since = "1.80.0")]
21372136
impl<'a, I, A: Allocator> !Iterator for &'a mut Box<[I], A> {}
21382137

21392138
// Note: the `#[rustc_skip_during_method_dispatch(boxed_slice)]` on `trait IntoIterator`
21402139
// hides this implementation from explicit `.into_iter()` calls on editions < 2024,
21412140
// so those calls will still resolve to the slice implementation, by reference.
2142-
#[stable(feature = "boxed_slice_into_iter", since = "CURRENT_RUSTC_VERSION")]
2141+
#[stable(feature = "boxed_slice_into_iter", since = "1.80.0")]
21432142
impl<I, A: Allocator> IntoIterator for Box<[I], A> {
21442143
type IntoIter = vec::IntoIter<I, A>;
21452144
type Item = I;
@@ -2148,7 +2147,7 @@ impl<I, A: Allocator> IntoIterator for Box<[I], A> {
21482147
}
21492148
}
21502149

2151-
#[stable(feature = "boxed_slice_into_iter", since = "CURRENT_RUSTC_VERSION")]
2150+
#[stable(feature = "boxed_slice_into_iter", since = "1.80.0")]
21522151
impl<'a, I, A: Allocator> IntoIterator for &'a Box<[I], A> {
21532152
type IntoIter = slice::Iter<'a, I>;
21542153
type Item = &'a I;
@@ -2157,7 +2156,7 @@ impl<'a, I, A: Allocator> IntoIterator for &'a Box<[I], A> {
21572156
}
21582157
}
21592158

2160-
#[stable(feature = "boxed_slice_into_iter", since = "CURRENT_RUSTC_VERSION")]
2159+
#[stable(feature = "boxed_slice_into_iter", since = "1.80.0")]
21612160
impl<'a, I, A: Allocator> IntoIterator for &'a mut Box<[I], A> {
21622161
type IntoIter = slice::IterMut<'a, I>;
21632162
type Item = &'a mut I;
@@ -2167,47 +2166,47 @@ impl<'a, I, A: Allocator> IntoIterator for &'a mut Box<[I], A> {
21672166
}
21682167

21692168
#[cfg(not(no_global_oom_handling))]
2170-
#[stable(feature = "boxed_str_from_iter", since = "CURRENT_RUSTC_VERSION")]
2169+
#[stable(feature = "boxed_str_from_iter", since = "1.80.0")]
21712170
impl FromIterator<char> for Box<str> {
21722171
fn from_iter<T: IntoIterator<Item = char>>(iter: T) -> Self {
21732172
String::from_iter(iter).into_boxed_str()
21742173
}
21752174
}
21762175

21772176
#[cfg(not(no_global_oom_handling))]
2178-
#[stable(feature = "boxed_str_from_iter", since = "CURRENT_RUSTC_VERSION")]
2177+
#[stable(feature = "boxed_str_from_iter", since = "1.80.0")]
21792178
impl<'a> FromIterator<&'a char> for Box<str> {
21802179
fn from_iter<T: IntoIterator<Item = &'a char>>(iter: T) -> Self {
21812180
String::from_iter(iter).into_boxed_str()
21822181
}
21832182
}
21842183

21852184
#[cfg(not(no_global_oom_handling))]
2186-
#[stable(feature = "boxed_str_from_iter", since = "CURRENT_RUSTC_VERSION")]
2185+
#[stable(feature = "boxed_str_from_iter", since = "1.80.0")]
21872186
impl<'a> FromIterator<&'a str> for Box<str> {
21882187
fn from_iter<T: IntoIterator<Item = &'a str>>(iter: T) -> Self {
21892188
String::from_iter(iter).into_boxed_str()
21902189
}
21912190
}
21922191

21932192
#[cfg(not(no_global_oom_handling))]
2194-
#[stable(feature = "boxed_str_from_iter", since = "CURRENT_RUSTC_VERSION")]
2193+
#[stable(feature = "boxed_str_from_iter", since = "1.80.0")]
21952194
impl FromIterator<String> for Box<str> {
21962195
fn from_iter<T: IntoIterator<Item = String>>(iter: T) -> Self {
21972196
String::from_iter(iter).into_boxed_str()
21982197
}
21992198
}
22002199

22012200
#[cfg(not(no_global_oom_handling))]
2202-
#[stable(feature = "boxed_str_from_iter", since = "CURRENT_RUSTC_VERSION")]
2201+
#[stable(feature = "boxed_str_from_iter", since = "1.80.0")]
22032202
impl<A: Allocator> FromIterator<Box<str, A>> for Box<str> {
22042203
fn from_iter<T: IntoIterator<Item = Box<str, A>>>(iter: T) -> Self {
22052204
String::from_iter(iter).into_boxed_str()
22062205
}
22072206
}
22082207

22092208
#[cfg(not(no_global_oom_handling))]
2210-
#[stable(feature = "boxed_str_from_iter", since = "CURRENT_RUSTC_VERSION")]
2209+
#[stable(feature = "boxed_str_from_iter", since = "1.80.0")]
22112210
impl<'a> FromIterator<Cow<'a, str>> for Box<str> {
22122211
fn from_iter<T: IntoIterator<Item = Cow<'a, str>>>(iter: T) -> Self {
22132212
String::from_iter(iter).into_boxed_str()

library/alloc/src/collections/binary_heap/mod.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -440,10 +440,7 @@ impl<T: Ord> BinaryHeap<T> {
440440
/// heap.push(4);
441441
/// ```
442442
#[stable(feature = "rust1", since = "1.0.0")]
443-
#[rustc_const_stable(
444-
feature = "const_binary_heap_constructor",
445-
since = "CURRENT_RUSTC_VERSION"
446-
)]
443+
#[rustc_const_stable(feature = "const_binary_heap_constructor", since = "1.80.0")]
447444
#[must_use]
448445
pub const fn new() -> BinaryHeap<T> {
449446
BinaryHeap { data: vec![] }
@@ -1224,7 +1221,7 @@ impl<T, A: Allocator> BinaryHeap<T, A> {
12241221
/// io::sink().write(heap.as_slice()).unwrap();
12251222
/// ```
12261223
#[must_use]
1227-
#[stable(feature = "binary_heap_as_slice", since = "CURRENT_RUSTC_VERSION")]
1224+
#[stable(feature = "binary_heap_as_slice", since = "1.80.0")]
12281225
pub fn as_slice(&self) -> &[T] {
12291226
self.data.as_slice()
12301227
}

library/alloc/src/ffi/c_str.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,7 @@ impl From<&CStr> for Rc<CStr> {
911911
}
912912

913913
#[cfg(not(no_global_oom_handling))]
914-
#[stable(feature = "more_rc_default_impls", since = "CURRENT_RUSTC_VERSION")]
914+
#[stable(feature = "more_rc_default_impls", since = "1.80.0")]
915915
impl Default for Rc<CStr> {
916916
/// Creates an empty CStr inside an Rc
917917
///

library/alloc/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@
165165
//
166166
// Language features:
167167
// tidy-alphabetical-start
168-
#![cfg_attr(bootstrap, feature(exclusive_range_pattern))]
169168
#![cfg_attr(not(test), feature(coroutine_trait))]
170169
#![cfg_attr(test, feature(panic_update_hook))]
171170
#![cfg_attr(test, feature(test))]

library/alloc/src/rc.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2250,7 +2250,7 @@ impl<T: Default> Default for Rc<T> {
22502250
}
22512251

22522252
#[cfg(not(no_global_oom_handling))]
2253-
#[stable(feature = "more_rc_default_impls", since = "CURRENT_RUSTC_VERSION")]
2253+
#[stable(feature = "more_rc_default_impls", since = "1.80.0")]
22542254
impl Default for Rc<str> {
22552255
/// Creates an empty str inside an Rc
22562256
///
@@ -2262,7 +2262,7 @@ impl Default for Rc<str> {
22622262
}
22632263

22642264
#[cfg(not(no_global_oom_handling))]
2265-
#[stable(feature = "more_rc_default_impls", since = "CURRENT_RUSTC_VERSION")]
2265+
#[stable(feature = "more_rc_default_impls", since = "1.80.0")]
22662266
impl<T> Default for Rc<[T]> {
22672267
/// Creates an empty `[T]` inside an Rc
22682268
///

library/alloc/src/sync.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -3405,7 +3405,7 @@ static STATIC_INNER_SLICE: SliceArcInnerForStatic = SliceArcInnerForStatic {
34053405
};
34063406

34073407
#[cfg(not(no_global_oom_handling))]
3408-
#[stable(feature = "more_rc_default_impls", since = "CURRENT_RUSTC_VERSION")]
3408+
#[stable(feature = "more_rc_default_impls", since = "1.80.0")]
34093409
impl Default for Arc<str> {
34103410
/// Creates an empty str inside an Arc
34113411
///
@@ -3420,7 +3420,7 @@ impl Default for Arc<str> {
34203420
}
34213421

34223422
#[cfg(not(no_global_oom_handling))]
3423-
#[stable(feature = "more_rc_default_impls", since = "CURRENT_RUSTC_VERSION")]
3423+
#[stable(feature = "more_rc_default_impls", since = "1.80.0")]
34243424
impl Default for Arc<core::ffi::CStr> {
34253425
/// Creates an empty CStr inside an Arc
34263426
///
@@ -3439,7 +3439,7 @@ impl Default for Arc<core::ffi::CStr> {
34393439
}
34403440

34413441
#[cfg(not(no_global_oom_handling))]
3442-
#[stable(feature = "more_rc_default_impls", since = "CURRENT_RUSTC_VERSION")]
3442+
#[stable(feature = "more_rc_default_impls", since = "1.80.0")]
34433443
impl<T> Default for Arc<[T]> {
34443444
/// Creates an empty `[T]` inside an Arc
34453445
///

library/alloc/src/vec/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2649,7 +2649,7 @@ impl<T, A: Allocator, const N: usize> Vec<[T; N], A> {
26492649
/// let mut flattened = vec.into_flattened();
26502650
/// assert_eq!(flattened.pop(), Some(6));
26512651
/// ```
2652-
#[stable(feature = "slice_flatten", since = "CURRENT_RUSTC_VERSION")]
2652+
#[stable(feature = "slice_flatten", since = "1.80.0")]
26532653
pub fn into_flattened(self) -> Vec<T, A> {
26542654
let (ptr, len, cap, alloc) = self.into_raw_parts_with_alloc();
26552655
let (new_len, new_cap) = if T::IS_ZST {

library/core/src/cell.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ use crate::ptr::{self, NonNull};
260260
mod lazy;
261261
mod once;
262262

263-
#[stable(feature = "lazy_cell", since = "CURRENT_RUSTC_VERSION")]
263+
#[stable(feature = "lazy_cell", since = "1.80.0")]
264264
pub use lazy::LazyCell;
265265
#[stable(feature = "once_cell", since = "1.70.0")]
266266
pub use once::OnceCell;

library/core/src/cell/lazy.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ enum State<T, F> {
3434
/// // 92
3535
/// // 92
3636
/// ```
37-
#[stable(feature = "lazy_cell", since = "CURRENT_RUSTC_VERSION")]
37+
#[stable(feature = "lazy_cell", since = "1.80.0")]
3838
pub struct LazyCell<T, F = fn() -> T> {
3939
state: UnsafeCell<State<T, F>>,
4040
}
@@ -54,8 +54,8 @@ impl<T, F: FnOnce() -> T> LazyCell<T, F> {
5454
/// assert_eq!(&*lazy, "HELLO, WORLD!");
5555
/// ```
5656
#[inline]
57-
#[stable(feature = "lazy_cell", since = "CURRENT_RUSTC_VERSION")]
58-
#[rustc_const_stable(feature = "lazy_cell", since = "CURRENT_RUSTC_VERSION")]
57+
#[stable(feature = "lazy_cell", since = "1.80.0")]
58+
#[rustc_const_stable(feature = "lazy_cell", since = "1.80.0")]
5959
pub const fn new(f: F) -> LazyCell<T, F> {
6060
LazyCell { state: UnsafeCell::new(State::Uninit(f)) }
6161
}
@@ -103,7 +103,7 @@ impl<T, F: FnOnce() -> T> LazyCell<T, F> {
103103
/// assert_eq!(&*lazy, &92);
104104
/// ```
105105
#[inline]
106-
#[stable(feature = "lazy_cell", since = "CURRENT_RUSTC_VERSION")]
106+
#[stable(feature = "lazy_cell", since = "1.80.0")]
107107
pub fn force(this: &LazyCell<T, F>) -> &T {
108108
// SAFETY:
109109
// This invalidates any mutable references to the data. The resulting
@@ -167,7 +167,7 @@ impl<T, F> LazyCell<T, F> {
167167
}
168168
}
169169

170-
#[stable(feature = "lazy_cell", since = "CURRENT_RUSTC_VERSION")]
170+
#[stable(feature = "lazy_cell", since = "1.80.0")]
171171
impl<T, F: FnOnce() -> T> Deref for LazyCell<T, F> {
172172
type Target = T;
173173
#[inline]
@@ -176,7 +176,7 @@ impl<T, F: FnOnce() -> T> Deref for LazyCell<T, F> {
176176
}
177177
}
178178

179-
#[stable(feature = "lazy_cell", since = "CURRENT_RUSTC_VERSION")]
179+
#[stable(feature = "lazy_cell", since = "1.80.0")]
180180
impl<T: Default> Default for LazyCell<T> {
181181
/// Creates a new lazy value using `Default` as the initializing function.
182182
#[inline]
@@ -185,7 +185,7 @@ impl<T: Default> Default for LazyCell<T> {
185185
}
186186
}
187187

188-
#[stable(feature = "lazy_cell", since = "CURRENT_RUSTC_VERSION")]
188+
#[stable(feature = "lazy_cell", since = "1.80.0")]
189189
impl<T: fmt::Debug, F> fmt::Debug for LazyCell<T, F> {
190190
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
191191
let mut d = f.debug_tuple("LazyCell");

library/core/src/future/async_drop.rs

-1
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,6 @@ async unsafe fn either<O: IntoFuture<Output = ()>, M: IntoFuture<Output = ()>, T
256256
}
257257
}
258258

259-
#[cfg(not(bootstrap))]
260259
#[lang = "async_drop_deferred_drop_in_place"]
261260
async unsafe fn deferred_drop_in_place<T>(to_drop: *mut T) {
262261
// SAFETY: same safety requirements as with drop_in_place (implied by

library/core/src/future/future.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ use crate::task::{Context, Poll};
3535
pub trait Future {
3636
/// The type of value produced on completion.
3737
#[stable(feature = "futures_api", since = "1.36.0")]
38-
#[cfg_attr(not(bootstrap), lang = "future_output")]
38+
#[lang = "future_output"]
3939
type Output;
4040

4141
/// Attempt to resolve the future to a final value, registering

0 commit comments

Comments
 (0)