diff options
| author | bors <bors@rust-lang.org> | 2024-05-02 09:21:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-05-02 09:21:43 +0000 |
| commit | f5efc3c286a8e625f7932f9e6f52e5812a4b67fc (patch) | |
| tree | 20dddafe47e427c6419b05f3e3c8ec3d658f938a /compiler/rustc_codegen_gcc | |
| parent | fcc06c894b17f4d0c80b8934ea5f27faa894c960 (diff) | |
| parent | 44988e25770e87949e282f606dee702906bd2eed (diff) | |
| download | rust-f5efc3c286a8e625f7932f9e6f52e5812a4b67fc.tar.gz rust-f5efc3c286a8e625f7932f9e6f52e5812a4b67fc.zip | |
Auto merge of #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 d716d72586548963f32e5c8d57c41db0065fa6e0 from the beta branching, to continue to workaround #122758. r? bootstrap
Diffstat (limited to 'compiler/rustc_codegen_gcc')
| -rw-r--r-- | compiler/rustc_codegen_gcc/example/mini_core.rs | 1 | ||||
| -rw-r--r-- | compiler/rustc_codegen_gcc/src/lib.rs | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_gcc/example/mini_core.rs b/compiler/rustc_codegen_gcc/example/mini_core.rs index 8ffa66a4894..a48c0a4450c 100644 --- a/compiler/rustc_codegen_gcc/example/mini_core.rs +++ b/compiler/rustc_codegen_gcc/example/mini_core.rs @@ -420,7 +420,6 @@ pub fn panic(_msg: &'static str) -> ! { macro_rules! panic_const { ($($lang:ident = $message:expr,)+) => { - #[cfg(not(bootstrap))] pub mod panic_const { use super::*; diff --git a/compiler/rustc_codegen_gcc/src/lib.rs b/compiler/rustc_codegen_gcc/src/lib.rs index 345c22394f2..3f2fadce9e4 100644 --- a/compiler/rustc_codegen_gcc/src/lib.rs +++ b/compiler/rustc_codegen_gcc/src/lib.rs @@ -23,7 +23,6 @@ trusted_len, hash_raw_entry )] -#![cfg_attr(bootstrap, feature(associated_type_bounds))] #![allow(broken_intra_doc_links)] #![recursion_limit = "256"] #![warn(rust_2018_idioms)] |