Skip to content

Commit 3d66104

Browse files
committed
Auto merge of rust-lang#120821 - ehuss:fix-c-str-lit-bootstrap, r=Mark-Simulacrum
[Beta 1.77] Fix bootstrapping from 1.76 Due to the timing of the revert for stabilization of c_str_literal (rust-lang#119528 which reverted in 1.76) and trait_upcasting (rust-lang#120269 which reverted in 1.76), which happened after rust-lang#119211 (Bump stage0 to 1.76 beta), this resulted in some of the feature attributes not being restored which are needed to be able to bootstrap from 1.76. This restores those features. This also includes a stage0 bump to the just released stable. This is necessary because stage0 was currently pointing at an old beta which did not contain the reverts. Fixes rust-lang#120810
2 parents f204809 + ec15d9d commit 3d66104

File tree

8 files changed

+324
-420
lines changed

8 files changed

+324
-420
lines changed

compiler/rustc_codegen_llvm/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#![feature(rustdoc_internals)]
99
#![doc(rust_logo)]
1010
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
11+
#![cfg_attr(bootstrap, feature(c_str_literals))]
1112
#![feature(exact_size_is_empty)]
1213
#![feature(extern_types)]
1314
#![feature(hash_raw_entry)]

compiler/rustc_lint/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
#![feature(if_let_guard)]
3535
#![feature(iter_order_by)]
3636
#![feature(let_chains)]
37-
#![cfg_attr(not(bootstrap), feature(trait_upcasting))]
3837
#![feature(min_specialization)]
3938
#![feature(rustc_attrs)]
39+
#![feature(trait_upcasting)]
4040
#![deny(rustc::untranslatable_diagnostic)]
4141
#![deny(rustc::diagnostic_outside_of_impl)]
4242
#![allow(internal_features)]

compiler/rustc_llvm/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#![deny(rustc::untranslatable_diagnostic)]
22
#![deny(rustc::diagnostic_outside_of_impl)]
33
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
4+
#![cfg_attr(bootstrap, feature(c_str_literals))]
45
#![doc(rust_logo)]
56
#![feature(rustdoc_internals)]
67
#![allow(internal_features)]

compiler/rustc_middle/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
#![feature(associated_type_bounds)]
4949
#![feature(rustc_attrs)]
5050
#![feature(control_flow_enum)]
51-
#![cfg_attr(not(bootstrap), feature(trait_upcasting))]
51+
#![feature(trait_upcasting)]
5252
#![feature(try_blocks)]
5353
#![feature(decl_macro)]
5454
#![feature(extract_if)]

library/core/tests/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
#![feature(slice_flatten)]
112112
#![feature(error_generic_member_access)]
113113
#![feature(error_in_core)]
114-
#![cfg_attr(not(bootstrap), feature(trait_upcasting))]
114+
#![feature(trait_upcasting)]
115115
#![feature(utf8_chunks)]
116116
#![feature(is_ascii_octdigit)]
117117
#![feature(get_many_mut)]

library/std/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,7 @@
309309
//
310310
// Library features (core):
311311
// tidy-alphabetical-start
312+
#![cfg_attr(bootstrap, feature(c_str_literals))]
312313
#![feature(char_internals)]
313314
#![feature(core_intrinsics)]
314315
#![feature(core_io_borrowed_buf)]

src/stage0.json

+317-416
Large diffs are not rendered by default.

src/tools/miri/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#![feature(nonzero_ops)]
1111
#![feature(let_chains)]
1212
#![feature(lint_reasons)]
13-
#![cfg_attr(not(bootstrap), feature(trait_upcasting))]
13+
#![feature(trait_upcasting)]
1414
// Configure clippy and other lints
1515
#![allow(
1616
clippy::collapsible_else_if,

0 commit comments

Comments
 (0)