File tree Expand file tree Collapse file tree 4 files changed +2
-22
lines changed Expand file tree Collapse file tree 4 files changed +2
-22
lines changed Original file line number Diff line number Diff line change @@ -70,7 +70,6 @@ stack-cache-consistency-check = ["stack-cache"]
7070
7171[lints .rust .unexpected_cfgs ]
7272level = " warn"
73- check-cfg = [' cfg(bootstrap)' ]
7473
7574# Be aware that this file is inside a workspace when used via the
7675# submodule in the rustc repo. That means there are many cargo features
Original file line number Diff line number Diff line change @@ -176,11 +176,6 @@ pub fn phase_cargo_miri(mut args: impl Iterator<Item = String>) {
176176 // Set `--target-dir` to `miri` inside the original target directory.
177177 let target_dir = get_target_dir ( & metadata) ;
178178 cmd. arg ( "--target-dir" ) . arg ( target_dir) ;
179- // Only when running in x.py (where we are running with beta cargo): set `RUSTC_STAGE`.
180- // Will have to be removed on next bootstrap bump. tag: cfg(bootstrap).
181- if env:: var_os ( "RUSTC_STAGE" ) . is_some ( ) {
182- cmd. arg ( "-Zdoctest-xcompile" ) ;
183- }
184179
185180 // *After* we set all the flags that need setting, forward everything else. Make sure to skip
186181 // `--target-dir` (which would otherwise be set twice).
Original file line number Diff line number Diff line change @@ -8,19 +8,8 @@ pub mod thread;
88mod vector_clock;
99pub mod weak_memory;
1010
11- // cfg(bootstrap)
12- macro_rules! cfg_select_dispatch {
13- ( $( $tokens: tt) * ) => {
14- #[ cfg( bootstrap) ]
15- cfg_match! { $( $tokens) * }
16-
17- #[ cfg( not( bootstrap) ) ]
18- cfg_select! { $( $tokens) * }
19- } ;
20- }
21-
2211// Import either the real genmc adapter or a dummy module.
23- cfg_select_dispatch ! {
12+ cfg_select ! {
2413 feature = "genmc" => {
2514 mod genmc;
2615 pub use self :: genmc:: { GenmcCtx , GenmcConfig } ;
Original file line number Diff line number Diff line change 1- #![ cfg_attr( bootstrap, feature( cfg_match) ) ]
2- #![ cfg_attr( not( bootstrap) , feature( cfg_select) ) ]
1+ #![ feature( cfg_select) ]
32#![ feature( rustc_private) ]
43#![ feature( float_gamma) ]
54#![ feature( float_erf) ]
109#![ feature( variant_count) ]
1110#![ feature( yeet_expr) ]
1211#![ feature( nonzero_ops) ]
13- #![ cfg_attr( bootstrap, feature( nonnull_provenance) ) ]
1412#![ feature( strict_overflow_ops) ]
1513#![ feature( pointer_is_aligned_to) ]
1614#![ feature( ptr_metadata) ]
1715#![ feature( unqualified_local_imports) ]
1816#![ feature( derive_coerce_pointee) ]
1917#![ feature( arbitrary_self_types) ]
20- #![ cfg_attr( bootstrap, feature( file_lock) ) ]
2118// Configure clippy and other lints
2219#![ allow(
2320 clippy:: collapsible_else_if,
You can’t perform that action at this time.
0 commit comments