diff options
| author | bors <bors@rust-lang.org> | 2022-04-07 07:34:04 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-04-07 07:34:04 +0000 |
| commit | f565016eddc3cb812e647d54b06cfe74bdee2900 (patch) | |
| tree | 2ff05c1dacc33d2a51c0c80b3551301275a6e308 /src/tools | |
| parent | 8cd6080f6c778f6664ea3d12ca7848231707a627 (diff) | |
| parent | b500a78ac1dc70bef53ead56f5a1671bb9fd3d4c (diff) | |
| download | rust-f565016eddc3cb812e647d54b06cfe74bdee2900.tar.gz rust-f565016eddc3cb812e647d54b06cfe74bdee2900.zip | |
Auto merge of #95678 - pietroalbini:pa-1.62.0-bootstrap, r=Mark-Simulacrum
Bump bootstrap compiler to 1.61.0 beta This PR bumps the bootstrap compiler to the 1.61.0 beta. The first commit changes the stage0 compiler, the second commit applies the "mechanical" changes and the third and fourth commits apply changes explained in the relevant comments. r? `@Mark-Simulacrum`
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/compiletest/src/header.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs index 1bdea33dffa..8a72b44e2b5 100644 --- a/src/tools/compiletest/src/header.rs +++ b/src/tools/compiletest/src/header.rs @@ -806,8 +806,7 @@ pub fn make_test_description<R: Read>( cfg: Option<&str>, ) -> test::TestDesc { let mut ignore = false; - #[cfg(not(bootstrap))] - let ignore_message: Option<String> = None; + let ignore_message = None; let mut should_fail = false; let rustc_has_profiler_support = env::var_os("RUSTC_PROFILER_SUPPORT").is_some(); @@ -879,7 +878,6 @@ pub fn make_test_description<R: Read>( test::TestDesc { name, ignore, - #[cfg(not(bootstrap))] ignore_message, should_panic, compile_fail: false, |