Skip to content

Commit d25a35e

Browse files
committed
Auto merge of #2924 - RalfJung:rustup, r=RalfJung
Rustup
2 parents a3f689e + 7e5d5d6 commit d25a35e

File tree

2 files changed

+3
-12
lines changed

2 files changed

+3
-12
lines changed

rust-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
33c3d101280c8eb3cd8af421bfb56a8afcc3881d
1+
37998ab508d5d9fa0d465d7b535dc673087dda8f

tests/compiletest.rs

+2-11
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,9 @@ fn test_config(target: &str, path: &str, mode: Mode, with_dependencies: bool) ->
5151
let mut program = CommandBuilder::rustc();
5252
program.program = miri_path();
5353

54-
let in_rustc_test_suite = option_env!("RUSTC_STAGE").is_some();
55-
5654
// Add some flags we always want.
57-
if in_rustc_test_suite {
58-
// Less aggressive warnings to make the rustc toolstate management less painful.
59-
// (We often get warnings when e.g. a feature gets stabilized or some lint gets added/improved.)
60-
program.args.push("-Astable-features".into());
61-
program.args.push("-Aunused".into());
62-
} else {
63-
program.args.push("-Dwarnings".into());
64-
program.args.push("-Dunused".into());
65-
}
55+
program.args.push("-Dwarnings".into());
56+
program.args.push("-Dunused".into());
6657
if let Ok(extra_flags) = env::var("MIRIFLAGS") {
6758
for flag in extra_flags.split_whitespace() {
6859
program.args.push(flag.into());

0 commit comments

Comments
 (0)