Skip to content

Commit 39acbed

Browse files
borsbors
committed
Auto merge of #116407 - Mark-Simulacrum:bootstrap-bump, r=onur-ozkan
Bump bootstrap compiler to just-released beta https://forge.rust-lang.org/release/process.html#master-bootstrap-update-t-2-day-tuesday
2 parents 2a7c2df + ea1066d commit 39acbed

File tree

31 files changed

+529
-547
lines changed

31 files changed

+529
-547
lines changed

‎compiler/rustc_feature/src/accepted.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ declare_features! (
198198
/// + `impl Debug for Foo<'_>`
199199
(accepted, impl_header_lifetime_elision, "1.31.0", Some(15872), None),
200200
/// Allows referencing `Self` and projections in impl-trait.
201-
(accepted, impl_trait_projections, "CURRENT_RUSTC_VERSION", Some(103532), None),
201+
(accepted, impl_trait_projections, "1.74.0", Some(103532), None),
202202
/// Allows using `a..=b` and `..=b` as inclusive range syntaxes.
203203
(accepted, inclusive_range_syntax, "1.26.0", Some(28237), None),
204204
/// Allows inferring outlives requirements (RFC 2093).
@@ -270,7 +270,7 @@ declare_features! (
270270
/// Allows the use of or-patterns (e.g., `0 | 1`).
271271
(accepted, or_patterns, "1.53.0", Some(54883), None),
272272
/// Allows using `+bundle,+whole-archive` link modifiers with native libs.
273-
(accepted, packed_bundled_libs, "CURRENT_RUSTC_VERSION", Some(108081), None),
273+
(accepted, packed_bundled_libs, "1.74.0", Some(108081), None),
274274
/// Allows annotating functions conforming to `fn(&PanicInfo) -> !` with `#[panic_handler]`.
275275
/// This defines the behavior of panics.
276276
(accepted, panic_handler, "1.30.0", Some(44489), None),

‎compiler/rustc_feature/src/active.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -413,9 +413,9 @@ declare_features! (
413413
(active, const_try, "1.56.0", Some(74935), None),
414414
/// Allows function attribute `#[coverage(on/off)]`, to control coverage
415415
/// instrumentation of that function.
416-
(active, coverage_attribute, "CURRENT_RUSTC_VERSION", Some(84605), None),
416+
(active, coverage_attribute, "1.74.0", Some(84605), None),
417417
/// Allows users to provide classes for fenced code block using `class:classname`.
418-
(active, custom_code_classes_in_docs, "CURRENT_RUSTC_VERSION", Some(79483), None),
418+
(active, custom_code_classes_in_docs, "1.74.0", Some(79483), None),
419419
/// Allows non-builtin attributes in inner attribute position.
420420
(active, custom_inner_attributes, "1.30.0", Some(54726), None),
421421
/// Allows custom test frameworks with `#![test_runner]` and `#[test_case]`.
@@ -596,7 +596,7 @@ declare_features! (
596596
/// Enables rustc to generate code that instructs libstd to NOT ignore SIGPIPE.
597597
(active, unix_sigpipe, "1.65.0", Some(97889), None),
598598
/// Allows unnamed fields of struct and union type
599-
(incomplete, unnamed_fields, "CURRENT_RUSTC_VERSION", Some(49804), None),
599+
(incomplete, unnamed_fields, "1.74.0", Some(49804), None),
600600
/// Allows unsized fn parameters.
601601
(active, unsized_fn_params, "1.49.0", Some(48055), None),
602602
/// Allows unsized rvalues at arguments and parameters.

‎compiler/rustc_feature/src/removed.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ declare_features! (
121121
(removed, negate_unsigned, "1.0.0", Some(29645), None, None),
122122
/// Allows `#[no_coverage]` on functions.
123123
/// The feature was renamed to `coverage_attribute` and the attribute to `#[coverage(on|off)]`
124-
(removed, no_coverage, "CURRENT_RUSTC_VERSION", Some(84605), None, Some("renamed to `coverage_attribute`")),
124+
(removed, no_coverage, "1.74.0", Some(84605), None, Some("renamed to `coverage_attribute`")),
125125
/// Allows `#[no_debug]`.
126126
(removed, no_debug, "1.43.0", Some(29721), None, Some("removed due to lack of demand")),
127127
/// Note: this feature was previously recorded in a separate

‎library/alloc/src/rc.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1304,7 +1304,7 @@ impl<T: ?Sized, A: Allocator> Rc<T, A> {
13041304
/// assert_eq!(unsafe { &*x_ptr }, "hello");
13051305
/// ```
13061306
#[stable(feature = "rc_raw", since = "1.17.0")]
1307-
#[cfg_attr(not(bootstrap), rustc_never_returns_null_ptr)]
1307+
#[rustc_never_returns_null_ptr]
13081308
pub fn into_raw(this: Self) -> *const T {
13091309
let ptr = Self::as_ptr(&this);
13101310
mem::forget(this);
@@ -1328,7 +1328,7 @@ impl<T: ?Sized, A: Allocator> Rc<T, A> {
13281328
/// assert_eq!(unsafe { &*x_ptr }, "hello");
13291329
/// ```
13301330
#[stable(feature = "weak_into_raw", since = "1.45.0")]
1331-
#[cfg_attr(not(bootstrap), rustc_never_returns_null_ptr)]
1331+
#[rustc_never_returns_null_ptr]
13321332
pub fn as_ptr(this: &Self) -> *const T {
13331333
let ptr: *mut RcBox<T> = NonNull::as_ptr(this.ptr);
13341334

@@ -2409,7 +2409,7 @@ impl<T> From<T> for Rc<T> {
24092409
}
24102410

24112411
#[cfg(not(no_global_oom_handling))]
2412-
#[stable(feature = "shared_from_array", since = "CURRENT_RUSTC_VERSION")]
2412+
#[stable(feature = "shared_from_array", since = "1.74.0")]
24132413
impl<T, const N: usize> From<[T; N]> for Rc<[T]> {
24142414
/// Converts a [`[T; N]`](prim@array) into an `Rc<[T]>`.
24152415
///

‎library/alloc/src/sync.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1455,7 +1455,7 @@ impl<T: ?Sized, A: Allocator> Arc<T, A> {
14551455
/// ```
14561456
#[must_use = "losing the pointer will leak memory"]
14571457
#[stable(feature = "rc_raw", since = "1.17.0")]
1458-
#[cfg_attr(not(bootstrap), rustc_never_returns_null_ptr)]
1458+
#[rustc_never_returns_null_ptr]
14591459
pub fn into_raw(this: Self) -> *const T {
14601460
let ptr = Self::as_ptr(&this);
14611461
mem::forget(this);
@@ -1480,7 +1480,7 @@ impl<T: ?Sized, A: Allocator> Arc<T, A> {
14801480
/// ```
14811481
#[must_use]
14821482
#[stable(feature = "rc_as_ptr", since = "1.45.0")]
1483-
#[cfg_attr(not(bootstrap), rustc_never_returns_null_ptr)]
1483+
#[rustc_never_returns_null_ptr]
14841484
pub fn as_ptr(this: &Self) -> *const T {
14851485
let ptr: *mut ArcInner<T> = NonNull::as_ptr(this.ptr);
14861486

@@ -3271,7 +3271,7 @@ impl<T> From<T> for Arc<T> {
32713271
}
32723272

32733273
#[cfg(not(no_global_oom_handling))]
3274-
#[stable(feature = "shared_from_array", since = "CURRENT_RUSTC_VERSION")]
3274+
#[stable(feature = "shared_from_array", since = "1.74.0")]
32753275
impl<T, const N: usize> From<[T; N]> for Arc<[T]> {
32763276
/// Converts a [`[T; N]`](prim@array) into an `Arc<[T]>`.
32773277
///

‎library/alloc/src/vec/mod.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1258,7 +1258,7 @@ impl<T, A: Allocator> Vec<T, A> {
12581258
/// [`as_mut_ptr`]: Vec::as_mut_ptr
12591259
/// [`as_ptr`]: Vec::as_ptr
12601260
#[stable(feature = "vec_as_ptr", since = "1.37.0")]
1261-
#[cfg_attr(not(bootstrap), rustc_never_returns_null_ptr)]
1261+
#[rustc_never_returns_null_ptr]
12621262
#[inline]
12631263
pub fn as_ptr(&self) -> *const T {
12641264
// We shadow the slice method of the same name to avoid going through
@@ -1318,7 +1318,7 @@ impl<T, A: Allocator> Vec<T, A> {
13181318
/// [`as_mut_ptr`]: Vec::as_mut_ptr
13191319
/// [`as_ptr`]: Vec::as_ptr
13201320
#[stable(feature = "vec_as_ptr", since = "1.37.0")]
1321-
#[cfg_attr(not(bootstrap), rustc_never_returns_null_ptr)]
1321+
#[rustc_never_returns_null_ptr]
13221322
#[inline]
13231323
pub fn as_mut_ptr(&mut self) -> *mut T {
13241324
// We shadow the slice method of the same name to avoid going through
@@ -3155,7 +3155,7 @@ impl<T: Clone> From<&mut [T]> for Vec<T> {
31553155
}
31563156

31573157
#[cfg(not(no_global_oom_handling))]
3158-
#[stable(feature = "vec_from_array_ref", since = "CURRENT_RUSTC_VERSION")]
3158+
#[stable(feature = "vec_from_array_ref", since = "1.74.0")]
31593159
impl<T: Clone, const N: usize> From<&[T; N]> for Vec<T> {
31603160
/// Allocate a `Vec<T>` and fill it by cloning `s`'s items.
31613161
///
@@ -3170,7 +3170,7 @@ impl<T: Clone, const N: usize> From<&[T; N]> for Vec<T> {
31703170
}
31713171

31723172
#[cfg(not(no_global_oom_handling))]
3173-
#[stable(feature = "vec_from_array_ref", since = "CURRENT_RUSTC_VERSION")]
3173+
#[stable(feature = "vec_from_array_ref", since = "1.74.0")]
31743174
impl<T: Clone, const N: usize> From<&mut [T; N]> for Vec<T> {
31753175
/// Allocate a `Vec<T>` and fill it by cloning `s`'s items.
31763176
///

‎library/core/src/cell.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ impl<T: ?Sized> Cell<T> {
556556
#[inline]
557557
#[stable(feature = "cell_as_ptr", since = "1.12.0")]
558558
#[rustc_const_stable(feature = "const_cell_as_ptr", since = "1.32.0")]
559-
#[cfg_attr(not(bootstrap), rustc_never_returns_null_ptr)]
559+
#[rustc_never_returns_null_ptr]
560560
pub const fn as_ptr(&self) -> *mut T {
561561
self.value.get()
562562
}
@@ -1112,7 +1112,7 @@ impl<T: ?Sized> RefCell<T> {
11121112
/// ```
11131113
#[inline]
11141114
#[stable(feature = "cell_as_ptr", since = "1.12.0")]
1115-
#[cfg_attr(not(bootstrap), rustc_never_returns_null_ptr)]
1115+
#[rustc_never_returns_null_ptr]
11161116
pub fn as_ptr(&self) -> *mut T {
11171117
self.value.get()
11181118
}
@@ -2109,7 +2109,7 @@ impl<T: ?Sized> UnsafeCell<T> {
21092109
#[inline(always)]
21102110
#[stable(feature = "rust1", since = "1.0.0")]
21112111
#[rustc_const_stable(feature = "const_unsafecell_get", since = "1.32.0")]
2112-
#[cfg_attr(not(bootstrap), rustc_never_returns_null_ptr)]
2112+
#[rustc_never_returns_null_ptr]
21132113
pub const fn get(&self) -> *mut T {
21142114
// We can just cast the pointer from `UnsafeCell<T>` to `T` because of
21152115
// #[repr(transparent)]. This exploits std's special status, there is
@@ -2253,7 +2253,7 @@ impl<T: ?Sized> SyncUnsafeCell<T> {
22532253
/// when casting to `&mut T`, and ensure that there are no mutations
22542254
/// or mutable aliases going on when casting to `&T`
22552255
#[inline]
2256-
#[cfg_attr(not(bootstrap), rustc_never_returns_null_ptr)]
2256+
#[rustc_never_returns_null_ptr]
22572257
pub const fn get(&self) -> *mut T {
22582258
self.value.get()
22592259
}

‎library/core/src/char/convert.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ impl TryFrom<char> for u8 {
115115
/// failing if the code point is greater than U+FFFF.
116116
///
117117
/// This corresponds to the UCS-2 encoding, as specified in ISO/IEC 10646:2003.
118-
#[stable(feature = "u16_from_char", since = "CURRENT_RUSTC_VERSION")]
118+
#[stable(feature = "u16_from_char", since = "1.74.0")]
119119
impl TryFrom<char> for u16 {
120120
type Error = TryFromCharError;
121121

‎library/core/src/cmp.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -311,8 +311,7 @@ pub trait Eq: PartialEq<Self> {
311311
//
312312
// This should never be implemented by hand.
313313
#[doc(hidden)]
314-
#[cfg_attr(bootstrap, no_coverage)] // rust-lang/rust#84605
315-
#[cfg_attr(not(bootstrap), coverage(off))] //
314+
#[coverage(off)]
316315
#[inline]
317316
#[stable(feature = "rust1", since = "1.0.0")]
318317
fn assert_receiver_is_total_eq(&self) {}
@@ -322,8 +321,7 @@ pub trait Eq: PartialEq<Self> {
322321
#[rustc_builtin_macro]
323322
#[stable(feature = "builtin_macro_prelude", since = "1.38.0")]
324323
#[allow_internal_unstable(core_intrinsics, derive_eq, structural_match)]
325-
#[cfg_attr(bootstrap, allow_internal_unstable(no_coverage))]
326-
#[cfg_attr(not(bootstrap), allow_internal_unstable(coverage_attribute))]
324+
#[allow_internal_unstable(coverage_attribute)]
327325
pub macro Eq($item:item) {
328326
/* compiler built-in */
329327
}

‎library/core/src/ffi/c_str.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ impl CStr {
487487
#[must_use]
488488
#[stable(feature = "rust1", since = "1.0.0")]
489489
#[rustc_const_stable(feature = "const_str_as_ptr", since = "1.32.0")]
490-
#[cfg_attr(not(bootstrap), rustc_never_returns_null_ptr)]
490+
#[rustc_never_returns_null_ptr]
491491
pub const fn as_ptr(&self) -> *const c_char {
492492
self.inner.as_ptr()
493493
}

‎library/core/src/intrinsics/mir.rs

+3-7
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
//!
1313
//! Typical usage will look like this:
1414
//!
15-
#![cfg_attr(bootstrap, doc = "```rust,ignore")]
16-
#![cfg_attr(not(bootstrap), doc = "```rust")]
15+
//! ```rust
1716
//! #![feature(core_intrinsics, custom_mir)]
1817
//! #![allow(internal_features)]
1918
//!
@@ -63,8 +62,7 @@
6362
//!
6463
//! # Examples
6564
//!
66-
#![cfg_attr(bootstrap, doc = "```rust,ignore")]
67-
#![cfg_attr(not(bootstrap), doc = "```rust")]
65+
//! ```rust
6866
//! #![feature(core_intrinsics, custom_mir)]
6967
//! #![allow(internal_features)]
7068
//!
@@ -106,7 +104,6 @@
106104
//! }
107105
//!
108106
//! #[custom_mir(dialect = "runtime", phase = "optimized")]
109-
#![cfg_attr(bootstrap, doc = "#[cfg(any())]")] // disable the following function in doctests when `bootstrap` is set
110107
//! fn push_and_pop<T>(v: &mut Vec<T>, value: T) {
111108
//! mir!(
112109
//! let _unused;
@@ -319,8 +316,7 @@ define!(
319316
///
320317
/// # Examples
321318
///
322-
#[cfg_attr(bootstrap, doc = "```rust,ignore")]
323-
#[cfg_attr(not(bootstrap), doc = "```rust")]
319+
/// ```rust
324320
/// #![allow(internal_features)]
325321
/// #![feature(custom_mir, core_intrinsics)]
326322
///

‎library/core/src/lib.rs

+4-5
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@
111111
//
112112
// Library features:
113113
// tidy-alphabetical-start
114-
#![cfg_attr(bootstrap, feature(no_coverage))] // rust-lang/rust#84605
115-
#![cfg_attr(not(bootstrap), feature(coverage_attribute))] // rust-lang/rust#84605
116114
#![feature(char_indices_offset)]
117115
#![feature(const_align_of_val)]
118116
#![feature(const_align_of_val_raw)]
@@ -174,6 +172,7 @@
174172
#![feature(const_unsafecell_get_mut)]
175173
#![feature(const_waker)]
176174
#![feature(core_panic)]
175+
#![feature(coverage_attribute)]
177176
#![feature(duration_consts_float)]
178177
#![feature(internal_impls_macro)]
179178
#![feature(ip)]
@@ -197,7 +196,6 @@
197196
//
198197
// Language features:
199198
// tidy-alphabetical-start
200-
#![cfg_attr(not(bootstrap), feature(effects))]
201199
#![feature(abi_unadjusted)]
202200
#![feature(adt_const_params)]
203201
#![feature(allow_internal_unsafe)]
@@ -221,6 +219,7 @@
221219
#![feature(doc_cfg)]
222220
#![feature(doc_cfg_hide)]
223221
#![feature(doc_notable_trait)]
222+
#![feature(effects)]
224223
#![feature(exhaustive_patterns)]
225224
#![feature(extern_types)]
226225
#![feature(fundamental)]
@@ -414,13 +413,13 @@ pub mod primitive;
414413
dead_code,
415414
unused_imports,
416415
unsafe_op_in_unsafe_fn,
417-
ambiguous_glob_reexports
416+
ambiguous_glob_reexports,
417+
deprecated_in_future
418418
)]
419419
#[allow(rustdoc::bare_urls)]
420420
// FIXME: This annotation should be moved into rust-lang/stdarch after clashing_extern_declarations is
421421
// merged. It currently cannot because bootstrap fails as the lint hasn't been defined yet.
422422
#[allow(clashing_extern_declarations)]
423-
#[cfg_attr(bootstrap, allow(deprecated_in_future))]
424423
#[unstable(feature = "stdsimd", issue = "48556")]
425424
mod core_arch;
426425

‎library/core/src/mem/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1051,7 +1051,7 @@ pub const fn copy<T: Copy>(x: &T) -> T {
10511051
#[inline]
10521052
#[must_use]
10531053
#[stable(feature = "rust1", since = "1.0.0")]
1054-
#[rustc_const_stable(feature = "const_transmute_copy", since = "CURRENT_RUSTC_VERSION")]
1054+
#[rustc_const_stable(feature = "const_transmute_copy", since = "1.74.0")]
10551055
pub const unsafe fn transmute_copy<Src, Dst>(src: &Src) -> Dst {
10561056
assert!(
10571057
size_of::<Src>() >= size_of::<Dst>(),

‎library/core/src/num/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ mod nonzero;
4747
mod saturating;
4848
mod wrapping;
4949

50-
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
50+
#[stable(feature = "saturating_int_impl", since = "1.74.0")]
5151
pub use saturating::Saturating;
5252
#[stable(feature = "rust1", since = "1.0.0")]
5353
pub use wrapping::Wrapping;

0 commit comments

Comments
 (0)