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"]
70
70
71
71
[lints .rust .unexpected_cfgs ]
72
72
level = " warn"
73
- check-cfg = [' cfg(bootstrap)' ]
74
73
75
74
# Be aware that this file is inside a workspace when used via the
76
75
# 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>) {
176
176
// Set `--target-dir` to `miri` inside the original target directory.
177
177
let target_dir = get_target_dir ( & metadata) ;
178
178
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
- }
184
179
185
180
// *After* we set all the flags that need setting, forward everything else. Make sure to skip
186
181
// `--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;
8
8
mod vector_clock;
9
9
pub mod weak_memory;
10
10
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
-
22
11
// Import either the real genmc adapter or a dummy module.
23
- cfg_select_dispatch ! {
12
+ cfg_select ! {
24
13
feature = "genmc" => {
25
14
mod genmc;
26
15
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) ]
3
2
#![ feature( rustc_private) ]
4
3
#![ feature( float_gamma) ]
5
4
#![ feature( float_erf) ]
10
9
#![ feature( variant_count) ]
11
10
#![ feature( yeet_expr) ]
12
11
#![ feature( nonzero_ops) ]
13
- #![ cfg_attr( bootstrap, feature( nonnull_provenance) ) ]
14
12
#![ feature( strict_overflow_ops) ]
15
13
#![ feature( pointer_is_aligned_to) ]
16
14
#![ feature( ptr_metadata) ]
17
15
#![ feature( unqualified_local_imports) ]
18
16
#![ feature( derive_coerce_pointee) ]
19
17
#![ feature( arbitrary_self_types) ]
20
- #![ cfg_attr( bootstrap, feature( file_lock) ) ]
21
18
// Configure clippy and other lints
22
19
#![ allow(
23
20
clippy:: collapsible_else_if,
You can’t perform that action at this time.
0 commit comments