diff --git a/src/test/ui/binding/func-arg-ref-pattern.rs b/src/test/ui/binding/func-arg-ref-pattern.rs index ebb7a6afa9b..f46eeb7a020 100644 --- a/src/test/ui/binding/func-arg-ref-pattern.rs +++ b/src/test/ui/binding/func-arg-ref-pattern.rs @@ -1,5 +1,4 @@ // run-pass -// exec-env:RUST_POISON_ON_FREE=1 // Test argument patterns where we create refs to the inside of // boxes. Make sure that we don't free the box as we match the diff --git a/src/test/ui/issues/issue-18075.rs b/src/test/ui/issues/issue-18075.rs index ee6845c1278..56ec629c613 100644 --- a/src/test/ui/issues/issue-18075.rs +++ b/src/test/ui/issues/issue-18075.rs @@ -1,5 +1,5 @@ // run-pass -// exec-env:RUSTC_LOG=rustc::middle=debug +// rustc-env:RUSTC_LOG=rustc::middle=debug fn main() { let b = 1isize; diff --git a/src/test/ui/issues/issue-34932.rs b/src/test/ui/issues/issue-34932.rs index 3a5fd20ebc3..ab568fd01ef 100644 --- a/src/test/ui/issues/issue-34932.rs +++ b/src/test/ui/issues/issue-34932.rs @@ -1,6 +1,5 @@ // run-pass // compile-flags:--test -// rustc-env:RUSTC_BOOTSTRAP_KEY= #![cfg(any())] // This test should be configured away #![feature(rustc_attrs)] // Test that this is allowed on stable/beta #![feature(iter_arith_traits)] // Test that this is not unused diff --git a/src/test/ui/logging-only-prints-once.rs b/src/test/ui/logging-only-prints-once.rs index 6b49c441d1e..6d16819ceb0 100644 --- a/src/test/ui/logging-only-prints-once.rs +++ b/src/test/ui/logging-only-prints-once.rs @@ -1,7 +1,6 @@ // run-pass // ignore-windows // ignore-emscripten no threads support -// exec-env:RUSTC_LOG=debug use std::cell::Cell; use std::fmt; @@ -19,10 +18,13 @@ impl fmt::Debug for Foo { } pub fn main() { - thread::spawn(move|| { + thread::spawn(move || { let mut f = Foo(Cell::new(0)); println!("{:?}", f); let Foo(ref mut f) = f; assert_eq!(f.get(), 1); - }).join().ok().unwrap(); + }) + .join() + .ok() + .unwrap(); } diff --git a/src/test/ui/logging_before_rt_started.rs b/src/test/ui/logging_before_rt_started.rs deleted file mode 100644 index 540d2b4f58a..00000000000 --- a/src/test/ui/logging_before_rt_started.rs +++ /dev/null @@ -1,12 +0,0 @@ -// run-pass -// exec-env:RUSTC_LOG=std::ptr - -// In issue #9487, it was realized that std::ptr was invoking the logging -// infrastructure, and when std::ptr was used during runtime initialization, -// this caused some serious problems. The problems have since been fixed, but -// this test will trigger "output during runtime initialization" to make sure -// that the bug isn't re-introduced. - -// pretty-expanded FIXME #23616 - -pub fn main() {} diff --git a/src/test/ui/mismatched_types/const-fn-in-trait.rs b/src/test/ui/mismatched_types/const-fn-in-trait.rs index 7fcbd7e7e8b..3b1992d90b7 100644 --- a/src/test/ui/mismatched_types/const-fn-in-trait.rs +++ b/src/test/ui/mismatched_types/const-fn-in-trait.rs @@ -1,5 +1,3 @@ -// rustc-env:RUST_NEW_ERROR_FORMAT - #![feature(const_fn)] trait Foo { diff --git a/src/test/ui/mismatched_types/const-fn-in-trait.stderr b/src/test/ui/mismatched_types/const-fn-in-trait.stderr index 817582df27d..450981a9183 100644 --- a/src/test/ui/mismatched_types/const-fn-in-trait.stderr +++ b/src/test/ui/mismatched_types/const-fn-in-trait.stderr @@ -1,11 +1,11 @@ error[E0379]: functions in traits cannot be declared const - --> $DIR/const-fn-in-trait.rs:7:5 + --> $DIR/const-fn-in-trait.rs:5:5 | LL | const fn g(); | ^^^^^ functions in traits cannot be const error[E0379]: functions in traits cannot be declared const - --> $DIR/const-fn-in-trait.rs:11:5 + --> $DIR/const-fn-in-trait.rs:9:5 | LL | const fn f() -> u32 { 22 } | ^^^^^ functions in traits cannot be const diff --git a/src/test/ui/mismatched_types/trait-impl-fn-incompatibility.rs b/src/test/ui/mismatched_types/trait-impl-fn-incompatibility.rs index 949f5683c8a..ba206b8608f 100644 --- a/src/test/ui/mismatched_types/trait-impl-fn-incompatibility.rs +++ b/src/test/ui/mismatched_types/trait-impl-fn-incompatibility.rs @@ -1,5 +1,3 @@ -// rustc-env:RUST_NEW_ERROR_FORMAT - trait Foo { fn foo(x: u16); fn bar(&mut self, bar: &mut Bar); diff --git a/src/test/ui/mismatched_types/trait-impl-fn-incompatibility.stderr b/src/test/ui/mismatched_types/trait-impl-fn-incompatibility.stderr index b20fddb05ac..5735120f710 100644 --- a/src/test/ui/mismatched_types/trait-impl-fn-incompatibility.stderr +++ b/src/test/ui/mismatched_types/trait-impl-fn-incompatibility.stderr @@ -1,5 +1,5 @@ error[E0053]: method `foo` has an incompatible type for trait - --> $DIR/trait-impl-fn-incompatibility.rs:11:15 + --> $DIR/trait-impl-fn-incompatibility.rs:9:15 | LL | fn foo(x: u16); | --- type in trait @@ -11,7 +11,7 @@ LL | fn foo(x: i16) { } found fn pointer `fn(i16)` error[E0053]: method `bar` has an incompatible type for trait - --> $DIR/trait-impl-fn-incompatibility.rs:12:28 + --> $DIR/trait-impl-fn-incompatibility.rs:10:28 | LL | fn bar(&mut self, bar: &mut Bar); | -------- type in trait diff --git a/src/test/ui/threads-sendsync/spawning-with-debug.rs b/src/test/ui/threads-sendsync/spawning-with-debug.rs index 388d62aa710..9d3487ffb29 100644 --- a/src/test/ui/threads-sendsync/spawning-with-debug.rs +++ b/src/test/ui/threads-sendsync/spawning-with-debug.rs @@ -2,7 +2,7 @@ #![allow(unused_must_use)] #![allow(unused_mut)] // ignore-windows -// exec-env:RUSTC_LOG=debug +// exec-env:RUST_LOG=debug // ignore-emscripten no threads support // regression test for issue #10405, make sure we don't call println! too soon. @@ -11,5 +11,5 @@ use std::thread::Builder; pub fn main() { let mut t = Builder::new(); - t.spawn(move|| ()); + t.spawn(move || ()); } diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index 21fb7673ce0..653e1f13c4b 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -623,7 +623,7 @@ impl<'test> TestCx<'test> { .arg("-L") .arg(&aux_dir) .args(&self.props.compile_flags) - .envs(self.props.exec_env.clone()); + .envs(self.props.rustc_env.clone()); self.maybe_add_external_args( &mut rustc, self.split_maybe_args(&self.config.target_rustcflags),