Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit f5efc3c

Browse files
committed
Auto merge of rust-lang#124521 - Mark-Simulacrum:bootstrap-bump, r=albertlarsan68
Bump bootstrap compiler to latest beta https://forge.rust-lang.org/release/process.html#master-bootstrap-update-t-2-day-tuesday This also cherry-picks d716d72 from the beta branching, to continue to workaround rust-lang#122758. r? bootstrap
2 parents fcc06c8 + 44988e2 commit f5efc3c

File tree

65 files changed

+552
-784
lines changed

Some content is hidden

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

65 files changed

+552
-784
lines changed

compiler/rustc_ast/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#![doc(rust_logo)]
1212
#![allow(internal_features)]
1313
#![feature(rustdoc_internals)]
14-
#![cfg_attr(bootstrap, feature(associated_type_bounds))]
1514
#![feature(associated_type_defaults)]
1615
#![feature(box_patterns)]
1716
#![feature(if_let_guard)]

compiler/rustc_borrowck/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#![feature(rustdoc_internals)]
55
#![doc(rust_logo)]
66
#![feature(assert_matches)]
7-
#![cfg_attr(bootstrap, feature(associated_type_bounds))]
87
#![feature(box_patterns)]
98
#![feature(control_flow_enum)]
109
#![feature(let_chains)]

compiler/rustc_codegen_gcc/example/mini_core.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,6 @@ pub fn panic(_msg: &'static str) -> ! {
420420

421421
macro_rules! panic_const {
422422
($($lang:ident = $message:expr,)+) => {
423-
#[cfg(not(bootstrap))]
424423
pub mod panic_const {
425424
use super::*;
426425

compiler/rustc_codegen_gcc/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
trusted_len,
2424
hash_raw_entry
2525
)]
26-
#![cfg_attr(bootstrap, feature(associated_type_bounds))]
2726
#![allow(broken_intra_doc_links)]
2827
#![recursion_limit = "256"]
2928
#![warn(rust_2018_idioms)]

compiler/rustc_codegen_ssa/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#![allow(internal_features)]
55
#![allow(rustc::diagnostic_outside_of_impl)]
66
#![allow(rustc::untranslatable_diagnostic)]
7-
#![cfg_attr(bootstrap, feature(associated_type_bounds))]
87
#![feature(box_patterns)]
98
#![feature(if_let_guard)]
109
#![feature(let_chains)]

compiler/rustc_data_structures/src/sync.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ use std::collections::HashMap;
4646
use std::hash::{BuildHasher, Hash};
4747

4848
mod lock;
49+
#[doc(no_inline)]
4950
pub use lock::{Lock, LockGuard, Mode};
5051

5152
mod worker_local;
@@ -199,10 +200,15 @@ cfg_match! {
199200

200201
pub use std::rc::Rc as Lrc;
201202
pub use std::rc::Weak as Weak;
203+
#[doc(no_inline)]
202204
pub use std::cell::Ref as ReadGuard;
205+
#[doc(no_inline)]
203206
pub use std::cell::Ref as MappedReadGuard;
207+
#[doc(no_inline)]
204208
pub use std::cell::RefMut as WriteGuard;
209+
#[doc(no_inline)]
205210
pub use std::cell::RefMut as MappedWriteGuard;
211+
#[doc(no_inline)]
206212
pub use std::cell::RefMut as MappedLockGuard;
207213

208214
pub use std::cell::OnceCell as OnceLock;

compiler/rustc_expand/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#![doc(rust_logo)]
22
#![feature(rustdoc_internals)]
33
#![feature(array_windows)]
4-
#![cfg_attr(bootstrap, feature(associated_type_bounds))]
54
#![feature(associated_type_defaults)]
65
#![feature(if_let_guard)]
76
#![feature(let_chains)]

compiler/rustc_feature/src/accepted.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ declare_features! (
6060
/// Allows the definition of associated constants in `trait` or `impl` blocks.
6161
(accepted, associated_consts, "1.20.0", Some(29646)),
6262
/// Allows the user of associated type bounds.
63-
(accepted, associated_type_bounds, "CURRENT_RUSTC_VERSION", Some(52662)),
63+
(accepted, associated_type_bounds, "1.79.0", Some(52662)),
6464
/// Allows using associated `type`s in `trait`s.
6565
(accepted, associated_types, "1.0.0", None),
6666
/// Allows free and inherent `async fn`s, `async` blocks, and `<expr>.await` expressions.
@@ -99,7 +99,7 @@ declare_features! (
9999
/// Allows using the CMPXCHG16B target feature.
100100
(accepted, cmpxchg16b_target_feature, "1.69.0", Some(44839)),
101101
/// Allows use of the `#[collapse_debuginfo]` attribute.
102-
(accepted, collapse_debuginfo, "CURRENT_RUSTC_VERSION", Some(100758)),
102+
(accepted, collapse_debuginfo, "1.79.0", Some(100758)),
103103
/// Allows usage of the `compile_error!` macro.
104104
(accepted, compile_error, "1.20.0", Some(40872)),
105105
/// Allows `impl Trait` in function return types.
@@ -208,13 +208,13 @@ declare_features! (
208208
/// Allows referencing `Self` and projections in impl-trait.
209209
(accepted, impl_trait_projections, "1.74.0", Some(103532)),
210210
/// Allows using imported `main` function
211-
(accepted, imported_main, "CURRENT_RUSTC_VERSION", Some(28937)),
211+
(accepted, imported_main, "1.79.0", Some(28937)),
212212
/// Allows using `a..=b` and `..=b` as inclusive range syntaxes.
213213
(accepted, inclusive_range_syntax, "1.26.0", Some(28237)),
214214
/// Allows inferring outlives requirements (RFC 2093).
215215
(accepted, infer_outlives_requirements, "1.30.0", Some(44493)),
216216
/// Allow anonymous constants from an inline `const` block
217-
(accepted, inline_const, "CURRENT_RUSTC_VERSION", Some(76001)),
217+
(accepted, inline_const, "1.79.0", Some(76001)),
218218
/// Allows irrefutable patterns in `if let` and `while let` statements (RFC 2086).
219219
(accepted, irrefutable_let_patterns, "1.33.0", Some(44495)),
220220
/// Allows `#[instruction_set(_)]` attribute.
@@ -360,7 +360,7 @@ declare_features! (
360360
/// Allows macros to appear in the type position.
361361
(accepted, type_macros, "1.13.0", Some(27245)),
362362
/// Allows using type privacy lints (`private_interfaces`, `private_bounds`, `unnameable_types`).
363-
(accepted, type_privacy_lints, "CURRENT_RUSTC_VERSION", Some(48054)),
363+
(accepted, type_privacy_lints, "1.79.0", Some(48054)),
364364
/// Allows `const _: TYPE = VALUE`.
365365
(accepted, underscore_const_names, "1.37.0", Some(54912)),
366366
/// Allows `use path as _;` and `extern crate c as _;`.

compiler/rustc_feature/src/unstable.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ declare_features! (
216216
/// Set the maximum pattern complexity allowed (not limited by default).
217217
(internal, pattern_complexity, "1.78.0", None),
218218
/// Allows using pattern types.
219-
(internal, pattern_types, "CURRENT_RUSTC_VERSION", Some(123646)),
219+
(internal, pattern_types, "1.79.0", Some(123646)),
220220
/// Allows using `#[prelude_import]` on glob `use` items.
221221
(internal, prelude_import, "1.2.0", None),
222222
/// Used to identify crates that contain the profiler runtime.
@@ -384,7 +384,7 @@ declare_features! (
384384
/// Allows `cfg(target_thread_local)`.
385385
(unstable, cfg_target_thread_local, "1.7.0", Some(29594)),
386386
/// Allows the use of `#[cfg(ub_checks)` to check if UB checks are enabled.
387-
(unstable, cfg_ub_checks, "CURRENT_RUSTC_VERSION", Some(123499)),
387+
(unstable, cfg_ub_checks, "1.79.0", Some(123499)),
388388
/// Allow conditional compilation depending on rust version
389389
(unstable, cfg_version, "1.45.0", Some(64796)),
390390
/// Allows to use the `#[cfi_encoding = ""]` attribute.
@@ -439,7 +439,7 @@ declare_features! (
439439
/// Allows having using `suggestion` in the `#[deprecated]` attribute.
440440
(unstable, deprecated_suggestion, "1.61.0", Some(94785)),
441441
/// Allows deref patterns.
442-
(incomplete, deref_patterns, "CURRENT_RUSTC_VERSION", Some(87121)),
442+
(incomplete, deref_patterns, "1.79.0", Some(87121)),
443443
/// Controls errors in trait implementations.
444444
(unstable, do_not_recommend, "1.67.0", Some(51992)),
445445
/// Tells rustdoc to automatically generate `#[doc(cfg(...))]`.
@@ -530,9 +530,9 @@ declare_features! (
530530
/// Allows the `#[must_not_suspend]` attribute.
531531
(unstable, must_not_suspend, "1.57.0", Some(83310)),
532532
/// Make `mut` not reset the binding mode on edition >= 2024.
533-
(incomplete, mut_preserve_binding_mode_2024, "CURRENT_RUSTC_VERSION", Some(123076)),
533+
(incomplete, mut_preserve_binding_mode_2024, "1.79.0", Some(123076)),
534534
/// Allows `mut ref` and `mut ref mut` identifier patterns.
535-
(incomplete, mut_ref, "CURRENT_RUSTC_VERSION", Some(123076)),
535+
(incomplete, mut_ref, "1.79.0", Some(123076)),
536536
/// Allows using `#[naked]` on functions.
537537
(unstable, naked_functions, "1.9.0", Some(90957)),
538538
/// Allows specifying the as-needed link modifier
@@ -564,17 +564,17 @@ declare_features! (
564564
/// Allows using `#[optimize(X)]`.
565565
(unstable, optimize_attribute, "1.34.0", Some(54882)),
566566
/// Allows postfix match `expr.match { ... }`
567-
(unstable, postfix_match, "CURRENT_RUSTC_VERSION", Some(121618)),
567+
(unstable, postfix_match, "1.79.0", Some(121618)),
568568
/// Allows `use<'a, 'b, A, B>` in `impl use<...> Trait` for precise capture of generic args.
569-
(incomplete, precise_capturing, "CURRENT_RUSTC_VERSION", Some(123432)),
569+
(incomplete, precise_capturing, "1.79.0", Some(123432)),
570570
/// Allows macro attributes on expressions, statements and non-inline modules.
571571
(unstable, proc_macro_hygiene, "1.30.0", Some(54727)),
572572
/// Allows `&raw const $place_expr` and `&raw mut $place_expr` expressions.
573573
(unstable, raw_ref_op, "1.41.0", Some(64490)),
574574
/// Makes `&` and `&mut` patterns eat only one layer of references in Rust 2024.
575-
(incomplete, ref_pat_eat_one_layer_2024, "CURRENT_RUSTC_VERSION", Some(123076)),
575+
(incomplete, ref_pat_eat_one_layer_2024, "1.79.0", Some(123076)),
576576
/// Allows `&` and `&mut` patterns to consume match-ergonomics-inserted references.
577-
(incomplete, ref_pat_everywhere, "CURRENT_RUSTC_VERSION", Some(123076)),
577+
(incomplete, ref_pat_everywhere, "1.79.0", Some(123076)),
578578
/// Allows using the `#[register_tool]` attribute.
579579
(unstable, register_tool, "1.41.0", Some(66079)),
580580
/// Allows the `#[repr(i128)]` attribute for enums.

compiler/rustc_infer/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#![allow(internal_features)]
1919
#![allow(rustc::diagnostic_outside_of_impl)]
2020
#![allow(rustc::untranslatable_diagnostic)]
21-
#![cfg_attr(bootstrap, feature(associated_type_bounds))]
2221
#![feature(box_patterns)]
2322
#![feature(control_flow_enum)]
2423
#![feature(extend_one)]

0 commit comments

Comments
 (0)