Skip to content

Commit 13afbda

Browse files
committed
Auto merge of #108862 - Mark-Simulacrum:bootstrap-bump, r=pietroalbini
Bump bootstrap compiler to 1.69 beta r? `@pietroalbini`
2 parents 03b01c5 + df0be2d commit 13afbda

File tree

19 files changed

+457
-481
lines changed

19 files changed

+457
-481
lines changed

compiler/rustc_feature/src/accepted.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ declare_features! (
9191
/// Allows coercing non capturing closures to function pointers.
9292
(accepted, closure_to_fn_coercion, "1.19.0", Some(39817), None),
9393
/// Allows using the CMPXCHG16B target feature.
94-
(accepted, cmpxchg16b_target_feature, "CURRENT_RUSTC_VERSION", Some(44839), None),
94+
(accepted, cmpxchg16b_target_feature, "1.69.0", Some(44839), None),
9595
/// Allows usage of the `compile_error!` macro.
9696
(accepted, compile_error, "1.20.0", Some(40872), None),
9797
/// Allows `impl Trait` in function return types.

compiler/rustc_feature/src/active.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ declare_features! (
161161
/// Allows using `#[lang = ".."]` attribute for linking items to special compiler logic.
162162
(active, lang_items, "1.0.0", None, None),
163163
/// Allows the `multiple_supertrait_upcastable` lint.
164-
(active, multiple_supertrait_upcastable, "CURRENT_RUSTC_VERSION", None, None),
164+
(active, multiple_supertrait_upcastable, "1.69.0", None, None),
165165
/// Allows using `#[omit_gdb_pretty_printer_section]`.
166166
(active, omit_gdb_pretty_printer_section, "1.5.0", None, None),
167167
/// Allows using `#[prelude_import]` on glob `use` items.
@@ -214,7 +214,7 @@ declare_features! (
214214
/// Allows declaring with `#![needs_panic_runtime]` that a panic runtime is needed.
215215
(active, needs_panic_runtime, "1.10.0", Some(32837), None),
216216
/// Allows using `+bundled,+whole-archive` native libs.
217-
(active, packed_bundled_libs, "CURRENT_RUSTC_VERSION", Some(108081), None),
217+
(active, packed_bundled_libs, "1.69.0", Some(108081), None),
218218
/// Allows using the `#![panic_runtime]` attribute.
219219
(active, panic_runtime, "1.10.0", Some(32837), None),
220220
/// Allows using `#[rustc_allow_const_fn_unstable]`.
@@ -468,7 +468,7 @@ declare_features! (
468468
/// Allows using the `non_exhaustive_omitted_patterns` lint.
469469
(active, non_exhaustive_omitted_patterns_lint, "1.57.0", Some(89554), None),
470470
/// Allows `for<T>` binders in where-clauses
471-
(incomplete, non_lifetime_binders, "CURRENT_RUSTC_VERSION", Some(108185), None),
471+
(incomplete, non_lifetime_binders, "1.69.0", Some(108185), None),
472472
/// Allows making `dyn Trait` well-formed even if `Trait` is not object safe.
473473
/// In that case, `dyn Trait: Trait` does not hold. Moreover, coercions and
474474
/// casts in safe Rust to `dyn Trait` for such a `Trait` is also forbidden.

library/alloc/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
#![warn(missing_debug_implementations)]
8888
#![warn(missing_docs)]
8989
#![allow(explicit_outlives_requirements)]
90-
#![cfg_attr(not(bootstrap), warn(multiple_supertrait_upcastable))]
90+
#![warn(multiple_supertrait_upcastable)]
9191
//
9292
// Library features:
9393
#![feature(alloc_layout_extra)]
@@ -195,7 +195,7 @@
195195
#![feature(c_unwind)]
196196
#![feature(with_negative_coherence)]
197197
#![cfg_attr(test, feature(panic_update_hook))]
198-
#![cfg_attr(not(bootstrap), feature(multiple_supertrait_upcastable))]
198+
#![feature(multiple_supertrait_upcastable)]
199199
//
200200
// Rustdoc features:
201201
#![feature(doc_cfg)]

library/core/src/error.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ use crate::fmt::{Debug, Display};
2828
#[stable(feature = "rust1", since = "1.0.0")]
2929
#[cfg_attr(not(test), rustc_diagnostic_item = "Error")]
3030
#[rustc_has_incoherent_inherent_impls]
31-
#[cfg_attr(not(bootstrap), allow(multiple_supertrait_upcastable))]
31+
#[allow(multiple_supertrait_upcastable)]
3232
pub trait Error: Debug + Display {
3333
/// The lower-level source of this error, if any.
3434
///
@@ -489,7 +489,7 @@ impl Error for crate::char::CharTryFromError {
489489
#[stable(feature = "duration_checked_float", since = "1.66.0")]
490490
impl Error for crate::time::TryFromFloatSecsError {}
491491

492-
#[stable(feature = "cstr_from_bytes_until_nul", since = "CURRENT_RUSTC_VERSION")]
492+
#[stable(feature = "cstr_from_bytes_until_nul", since = "1.69.0")]
493493
impl Error for crate::ffi::FromBytesUntilNulError {}
494494

495495
#[unstable(feature = "get_many_mut", issue = "104642")]

library/core/src/ffi/c_str.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,10 @@ impl Error for FromBytesWithNulError {
153153
/// This error is created by the [`CStr::from_bytes_until_nul`] method.
154154
///
155155
#[derive(Clone, PartialEq, Eq, Debug)]
156-
#[stable(feature = "cstr_from_bytes_until_nul", since = "CURRENT_RUSTC_VERSION")]
156+
#[stable(feature = "cstr_from_bytes_until_nul", since = "1.69.0")]
157157
pub struct FromBytesUntilNulError(());
158158

159-
#[stable(feature = "cstr_from_bytes_until_nul", since = "CURRENT_RUSTC_VERSION")]
159+
#[stable(feature = "cstr_from_bytes_until_nul", since = "1.69.0")]
160160
impl fmt::Display for FromBytesUntilNulError {
161161
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
162162
write!(f, "data provided does not contain a nul")
@@ -324,8 +324,8 @@ impl CStr {
324324
/// ```
325325
///
326326
#[rustc_allow_const_fn_unstable(const_slice_index)]
327-
#[stable(feature = "cstr_from_bytes_until_nul", since = "CURRENT_RUSTC_VERSION")]
328-
#[rustc_const_stable(feature = "cstr_from_bytes_until_nul", since = "CURRENT_RUSTC_VERSION")]
327+
#[stable(feature = "cstr_from_bytes_until_nul", since = "1.69.0")]
328+
#[rustc_const_stable(feature = "cstr_from_bytes_until_nul", since = "1.69.0")]
329329
pub const fn from_bytes_until_nul(bytes: &[u8]) -> Result<&CStr, FromBytesUntilNulError> {
330330
let nul_pos = memchr::memchr(0, bytes);
331331
match nul_pos {

library/core/src/fmt/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ extern "C" {
267267
/// family of functions. It contains a function to format the given value. At
268268
/// compile time it is ensured that the function and the value have the correct
269269
/// types, and then this struct is used to canonicalize arguments to one type.
270-
#[cfg_attr(not(bootstrap), lang = "format_argument")]
270+
#[lang = "format_argument"]
271271
#[derive(Copy, Clone)]
272272
#[allow(missing_debug_implementations)]
273273
#[unstable(feature = "fmt_internals", reason = "internal to format_args!", issue = "none")]
@@ -280,7 +280,7 @@ pub struct ArgumentV1<'a> {
280280
/// This struct represents the unsafety of constructing an `Arguments`.
281281
/// It exists, rather than an unsafe function, in order to simplify the expansion
282282
/// of `format_args!(..)` and reduce the scope of the `unsafe` block.
283-
#[cfg_attr(not(bootstrap), lang = "format_unsafe_arg")]
283+
#[lang = "format_unsafe_arg"]
284284
#[allow(missing_debug_implementations)]
285285
#[doc(hidden)]
286286
#[unstable(feature = "fmt_internals", reason = "internal to format_args!", issue = "none")]
@@ -497,7 +497,7 @@ impl<'a> Arguments<'a> {
497497
/// ```
498498
///
499499
/// [`format()`]: ../../std/fmt/fn.format.html
500-
#[cfg_attr(not(bootstrap), lang = "format_arguments")]
500+
#[lang = "format_arguments"]
501501
#[stable(feature = "rust1", since = "1.0.0")]
502502
#[derive(Copy, Clone)]
503503
pub struct Arguments<'a> {

library/core/src/fmt/rt/v1.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
//! these can be statically allocated and are slightly optimized for the runtime
66
#![allow(missing_debug_implementations)]
77

8-
#[cfg_attr(not(bootstrap), lang = "format_placeholder")]
8+
#[lang = "format_placeholder"]
99
#[derive(Copy, Clone)]
1010
// FIXME: Rename this to Placeholder
1111
pub struct Argument {
@@ -37,7 +37,7 @@ impl Argument {
3737
}
3838

3939
/// Possible alignments that can be requested as part of a formatting directive.
40-
#[cfg_attr(not(bootstrap), lang = "format_alignment")]
40+
#[lang = "format_alignment"]
4141
#[derive(Copy, Clone, PartialEq, Eq)]
4242
pub enum Alignment {
4343
/// Indication that contents should be left-aligned.
@@ -51,7 +51,7 @@ pub enum Alignment {
5151
}
5252

5353
/// Used by [width](https://doc.rust-lang.org/std/fmt/#width) and [precision](https://doc.rust-lang.org/std/fmt/#precision) specifiers.
54-
#[cfg_attr(not(bootstrap), lang = "format_count")]
54+
#[lang = "format_count"]
5555
#[derive(Copy, Clone)]
5656
pub enum Count {
5757
/// Specified with a literal number, stores the value

library/core/src/iter/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@
278278
//!
279279
//! ```
280280
//! # #![allow(unused_must_use)]
281-
//! # #![cfg_attr(not(bootstrap), allow(map_unit_fn))]
281+
//! # #![allow(map_unit_fn)]
282282
//! let v = vec![1, 2, 3, 4, 5];
283283
//! v.iter().map(|x| println!("{x}"));
284284
//! ```

library/core/src/iter/traits/iterator.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ fn _assert_is_object_safe(_: &dyn Iterator<Item = ()>) {}
6969
#[doc(notable_trait)]
7070
#[rustc_diagnostic_item = "Iterator"]
7171
#[must_use = "iterators are lazy and do nothing unless consumed"]
72-
#[cfg_attr(not(bootstrap), const_trait)]
72+
#[const_trait]
7373
pub trait Iterator {
7474
/// The type of the elements being iterated over.
7575
#[rustc_diagnostic_item = "IteratorItem"]

library/core/src/lib.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
#![warn(missing_docs)]
9696
#![allow(explicit_outlives_requirements)]
9797
#![allow(incomplete_features)]
98-
#![cfg_attr(not(bootstrap), warn(multiple_supertrait_upcastable))]
98+
#![warn(multiple_supertrait_upcastable)]
9999
//
100100
// Library features:
101101
#![feature(const_align_offset)]
@@ -241,7 +241,7 @@
241241
#![feature(unsized_fn_params)]
242242
#![feature(asm_const)]
243243
#![feature(const_transmute_copy)]
244-
#![cfg_attr(not(bootstrap), feature(multiple_supertrait_upcastable))]
244+
#![feature(multiple_supertrait_upcastable)]
245245
//
246246
// Target features:
247247
#![feature(arm_target_feature)]
@@ -254,7 +254,6 @@
254254
#![feature(sse4a_target_feature)]
255255
#![feature(tbm_target_feature)]
256256
#![feature(wasm_target_feature)]
257-
#![cfg_attr(bootstrap, feature(cmpxchg16b_target_feature))]
258257

259258
// allow using `core::` in intra-doc links
260259
#[allow(unused_extern_crates)]

0 commit comments

Comments
 (0)