Skip to content

Commit 46c59bb

Browse files
borsbors
committed
Auto merge of #100324 - Mark-Simulacrum:bootstrap-bump, r=jyn514
Bump bootstrap compiler to 1.64 r? `@jyn514` perhaps?
2 parents f22819b + 1c40ef7 commit 46c59bb

File tree

50 files changed

+417
-735
lines changed

Some content is hidden

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

50 files changed

+417
-735
lines changed

Diff for: ‎compiler/rustc_ast/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#![feature(const_trait_impl)]
1515
#![feature(if_let_guard)]
1616
#![feature(label_break_value)]
17-
#![cfg_attr(bootstrap, feature(let_chains))]
1817
#![feature(min_specialization)]
1918
#![feature(negative_impls)]
2019
#![feature(slice_internals)]

Diff for: ‎compiler/rustc_ast_lowering/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
//! in the HIR, especially for multiple identifiers.
3232
3333
#![feature(box_patterns)]
34-
#![cfg_attr(bootstrap, feature(let_chains))]
3534
#![feature(let_else)]
3635
#![feature(never_type)]
3736
#![recursion_limit = "256"]

Diff for: ‎compiler/rustc_ast_passes/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#![feature(box_patterns)]
99
#![feature(if_let_guard)]
1010
#![feature(iter_is_partitioned)]
11-
#![cfg_attr(bootstrap, feature(let_chains))]
1211
#![feature(let_else)]
1312
#![recursion_limit = "256"]
1413

Diff for: ‎compiler/rustc_attr/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
//! The goal is to move the definition of `MetaItem` and things that don't need to be in `syntax`
55
//! to this crate.
66
7-
#![cfg_attr(bootstrap, feature(let_chains))]
87
#![feature(let_else)]
98

109
#[macro_use]

Diff for: ‎compiler/rustc_borrowck/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
33
#![allow(rustc::potential_query_instability)]
44
#![feature(box_patterns)]
5-
#![cfg_attr(bootstrap, feature(let_chains))]
65
#![feature(let_else)]
76
#![feature(min_specialization)]
87
#![feature(never_type)]

Diff for: ‎compiler/rustc_builtin_macros/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#![feature(decl_macro)]
99
#![feature(if_let_guard)]
1010
#![feature(is_sorted)]
11-
#![cfg_attr(bootstrap, feature(let_chains))]
1211
#![feature(let_else)]
1312
#![feature(proc_macro_internals)]
1413
#![feature(proc_macro_quote)]

Diff for: ‎compiler/rustc_codegen_llvm/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
77
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
88
#![feature(hash_raw_entry)]
9-
#![cfg_attr(bootstrap, feature(let_chains))]
109
#![feature(let_else)]
1110
#![feature(extern_types)]
1211
#![feature(once_cell)]

Diff for: ‎compiler/rustc_const_eval/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ Rust MIR: a lowered representation of Rust.
99
#![feature(control_flow_enum)]
1010
#![feature(decl_macro)]
1111
#![feature(exact_size_is_empty)]
12-
#![cfg_attr(bootstrap, feature(let_chains))]
1312
#![feature(let_else)]
1413
#![feature(map_try_insert)]
1514
#![feature(min_specialization)]

Diff for: ‎compiler/rustc_error_messages/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#![cfg_attr(bootstrap, feature(let_chains))]
21
#![feature(once_cell)]
32
#![feature(rustc_attrs)]
43
#![feature(type_alias_impl_trait)]

Diff for: ‎compiler/rustc_errors/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
66
#![feature(drain_filter)]
77
#![feature(if_let_guard)]
8-
#![cfg_attr(bootstrap, feature(let_chains))]
98
#![feature(adt_const_params)]
109
#![feature(let_else)]
1110
#![feature(never_type)]

Diff for: ‎compiler/rustc_expand/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#![feature(associated_type_bounds)]
33
#![feature(associated_type_defaults)]
44
#![feature(if_let_guard)]
5-
#![cfg_attr(bootstrap, feature(let_chains))]
65
#![feature(let_else)]
76
#![feature(macro_metavar_expr)]
87
#![feature(proc_macro_diagnostic)]

Diff for: ‎compiler/rustc_infer/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#![feature(control_flow_enum)]
1919
#![feature(extend_one)]
2020
#![feature(label_break_value)]
21-
#![cfg_attr(bootstrap, feature(let_chains))]
2221
#![feature(let_else)]
2322
#![feature(min_specialization)]
2423
#![feature(never_type)]

Diff for: ‎compiler/rustc_interface/src/interface.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ pub fn create_compiler_and_run<R>(config: Config, f: impl FnOnce(&Compiler) -> R
330330
}
331331

332332
// JUSTIFICATION: before session exists, only config
333-
#[cfg_attr(not(bootstrap), allow(rustc::bad_opt_access))]
333+
#[allow(rustc::bad_opt_access)]
334334
pub fn run_compiler<R: Send>(config: Config, f: impl FnOnce(&Compiler) -> R + Send) -> R {
335335
tracing::trace!("run_compiler");
336336
util::run_in_thread_pool_with_globals(

Diff for: ‎compiler/rustc_interface/src/tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![cfg_attr(not(bootstrap), allow(rustc::bad_opt_access))]
1+
#![allow(rustc::bad_opt_access)]
22
use crate::interface::parse_cfgspecs;
33

44
use rustc_data_structures::fx::FxHashSet;

Diff for: ‎compiler/rustc_interface/src/util.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ pub fn collect_crate_types(session: &Session, attrs: &[ast::Attribute]) -> Vec<C
559559
// command line, then reuse the empty `base` Vec to hold the types that
560560
// will be found in crate attributes.
561561
// JUSTIFICATION: before wrapper fn is available
562-
#[cfg_attr(not(bootstrap), allow(rustc::bad_opt_access))]
562+
#[allow(rustc::bad_opt_access)]
563563
let mut base = session.opts.crate_types.clone();
564564
if base.is_empty() {
565565
base.extend(attr_types);

Diff for: ‎compiler/rustc_lint/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
#![feature(if_let_guard)]
3434
#![feature(iter_intersperse)]
3535
#![feature(iter_order_by)]
36-
#![cfg_attr(bootstrap, feature(let_chains))]
3736
#![feature(let_else)]
3837
#![feature(never_type)]
3938
#![recursion_limit = "256"]

Diff for: ‎compiler/rustc_metadata/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#![feature(generators)]
55
#![feature(generic_associated_types)]
66
#![feature(iter_from_generator)]
7-
#![cfg_attr(bootstrap, feature(let_chains))]
87
#![feature(let_else)]
98
#![feature(once_cell)]
109
#![feature(proc_macro_internals)]

Diff for: ‎compiler/rustc_middle/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
#![feature(extern_types)]
4040
#![feature(new_uninit)]
4141
#![feature(once_cell)]
42-
#![cfg_attr(bootstrap, feature(let_chains))]
4342
#![feature(let_else)]
4443
#![feature(min_specialization)]
4544
#![feature(trusted_len)]

Diff for: ‎compiler/rustc_mir_build/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#![feature(box_patterns)]
66
#![feature(control_flow_enum)]
77
#![feature(if_let_guard)]
8-
#![cfg_attr(bootstrap, feature(let_chains))]
98
#![feature(let_else)]
109
#![feature(min_specialization)]
1110
#![feature(once_cell)]

Diff for: ‎compiler/rustc_mir_transform/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#![allow(rustc::potential_query_instability)]
22
#![feature(box_patterns)]
3-
#![cfg_attr(bootstrap, feature(let_chains))]
43
#![feature(let_else)]
54
#![feature(map_try_insert)]
65
#![feature(min_specialization)]

Diff for: ‎compiler/rustc_parse/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#![feature(array_windows)]
44
#![feature(box_patterns)]
55
#![feature(if_let_guard)]
6-
#![cfg_attr(bootstrap, feature(let_chains))]
76
#![feature(let_else)]
87
#![feature(never_type)]
98
#![feature(rustc_attrs)]

Diff for: ‎compiler/rustc_passes/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#![allow(rustc::potential_query_instability)]
88
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
99
#![feature(iter_intersperse)]
10-
#![cfg_attr(bootstrap, feature(let_chains))]
1110
#![feature(let_else)]
1211
#![feature(map_try_insert)]
1312
#![feature(min_specialization)]

Diff for: ‎compiler/rustc_privacy/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
#![feature(try_blocks)]
66
#![recursion_limit = "256"]
77
#![allow(rustc::potential_query_instability)]
8-
#![cfg_attr(not(bootstrap), deny(rustc::untranslatable_diagnostic))]
9-
#![cfg_attr(not(bootstrap), deny(rustc::diagnostic_outside_of_impl))]
8+
#![deny(rustc::untranslatable_diagnostic)]
9+
#![deny(rustc::diagnostic_outside_of_impl)]
1010

1111
mod errors;
1212

Diff for: ‎compiler/rustc_resolve/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#![feature(box_patterns)]
1111
#![feature(drain_filter)]
1212
#![feature(if_let_guard)]
13-
#![cfg_attr(bootstrap, feature(let_chains))]
1413
#![feature(iter_intersperse)]
1514
#![feature(let_else)]
1615
#![feature(never_type)]

Diff for: ‎compiler/rustc_session/src/config.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -949,7 +949,7 @@ fn default_configuration(sess: &Session) -> CrateConfig {
949949
ret.insert((sym::debug_assertions, None));
950950
}
951951
// JUSTIFICATION: before wrapper fn is available
952-
#[cfg_attr(not(bootstrap), allow(rustc::bad_opt_access))]
952+
#[allow(rustc::bad_opt_access)]
953953
if sess.opts.crate_types.contains(&CrateType::ProcMacro) {
954954
ret.insert((sym::proc_macro, None));
955955
}
@@ -2198,7 +2198,7 @@ fn parse_remap_path_prefix(
21982198
}
21992199

22002200
// JUSTIFICATION: before wrapper fn is available
2201-
#[cfg_attr(not(bootstrap), allow(rustc::bad_opt_access))]
2201+
#[allow(rustc::bad_opt_access)]
22022202
pub fn build_session_options(matches: &getopts::Matches) -> Options {
22032203
let color = parse_color(matches);
22042204

Diff for: ‎compiler/rustc_session/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#![feature(if_let_guard)]
2-
#![cfg_attr(bootstrap, feature(let_chains))]
32
#![feature(let_else)]
43
#![feature(min_specialization)]
54
#![feature(never_type)]

0 commit comments

Comments
 (0)