From 0d8340327c03f319b49cb91e2e64aa66dd1e76c7 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 30 Jul 2015 08:53:22 -0700 Subject: [PATCH] syntax: Don't assume `std` exists for tests This commit removes the injection of `std::env::args()` from `--test` expanded code, relying on the test runner itself to call this funciton. This is more hygienic because we can't assume that `std` exists at the top layer all the time, and it meaks the injected test module entirely self contained. --- src/libstd/lib.rs | 8 -------- src/libstd/process.rs | 2 +- src/libstd/sys/unix/thread.rs | 1 + src/libstd/sys/windows/thread.rs | 2 +- src/libstd/thread/local.rs | 1 + src/libsyntax/test.rs | 23 +++++++++-------------- src/libtest/lib.rs | 19 ++++++++++--------- 7 files changed, 23 insertions(+), 33 deletions(-) diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index a694a9280dc..7baa7558e52 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -414,11 +414,3 @@ pub mod __rand { // the rustdoc documentation for primitive types. Using `include!` // because rustdoc only looks for these modules at the crate level. include!("primitive_docs.rs"); - -// The expansion of --test has a few references to `::std::$foo` so this module -// is necessary to get things to compile. -#[cfg(test)] -mod std { - pub use option; - pub use realstd::env; -} diff --git a/src/libstd/process.rs b/src/libstd/process.rs index 74a66558627..be921d9aef0 100644 --- a/src/libstd/process.rs +++ b/src/libstd/process.rs @@ -815,7 +815,7 @@ mod tests { #[cfg(target_os="android")] #[test] fn test_inherit_env() { - use std::env; + use env; let mut result = env_cmd().output().unwrap(); let output = String::from_utf8(result.stdout).unwrap(); diff --git a/src/libstd/sys/unix/thread.rs b/src/libstd/sys/unix/thread.rs index 6be61f06926..67ecd4d9229 100644 --- a/src/libstd/sys/unix/thread.rs +++ b/src/libstd/sys/unix/thread.rs @@ -166,6 +166,7 @@ impl Drop for Thread { not(target_os = "netbsd"), not(target_os = "openbsd")))] pub mod guard { + #[cfg(stage0)] use prelude::v1::*; pub unsafe fn current() -> Option { None } diff --git a/src/libstd/sys/windows/thread.rs b/src/libstd/sys/windows/thread.rs index a4131d4cada..15df5d756be 100644 --- a/src/libstd/sys/windows/thread.rs +++ b/src/libstd/sys/windows/thread.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#[cfg(stage0)] use prelude::v1::*; use alloc::boxed::FnBox; @@ -87,6 +86,7 @@ impl Thread { } pub mod guard { + #[cfg(stage0)] use prelude::v1::*; pub unsafe fn current() -> Option { None } diff --git a/src/libstd/thread/local.rs b/src/libstd/thread/local.rs index a6ecd2d88d2..0615033736e 100644 --- a/src/libstd/thread/local.rs +++ b/src/libstd/thread/local.rs @@ -329,6 +329,7 @@ mod imp { // Due to rust-lang/rust#18804, make sure this is not generic! #[cfg(target_os = "linux")] unsafe fn register_dtor(t: *mut u8, dtor: unsafe extern fn(*mut u8)) { + use prelude::v1::*; use mem; use libc; use sys_common::thread_local as os; diff --git a/src/libsyntax/test.rs b/src/libsyntax/test.rs index 2408e6b65a3..ea99291d6c2 100644 --- a/src/libsyntax/test.rs +++ b/src/libsyntax/test.rs @@ -450,18 +450,11 @@ fn mk_main(cx: &mut TestCtxt) -> P { // test::test_main_static let test_main_path = ecx.path(sp, vec![token::str_to_ident("test"), token::str_to_ident("test_main_static")]); - // ::std::env::args - let os_args_path = ecx.path_global(sp, vec![token::str_to_ident("std"), - token::str_to_ident("env"), - token::str_to_ident("args")]); - // ::std::env::args() - let os_args_path_expr = ecx.expr_path(os_args_path); - let call_os_args = ecx.expr_call(sp, os_args_path_expr, vec![]); // test::test_main_static(...) let test_main_path_expr = ecx.expr_path(test_main_path); let tests_ident_expr = ecx.expr_ident(sp, token::str_to_ident("TESTS")); let call_test_main = ecx.expr_call(sp, test_main_path_expr, - vec![call_os_args, tests_ident_expr]); + vec![tests_ident_expr]); let call_test_main = ecx.stmt_expr(call_test_main); // #![main] let main_meta = ecx.meta_word(sp, token::intern_and_get_ident("main")); @@ -634,12 +627,14 @@ fn mk_test_desc_and_fn_rec(cx: &TestCtxt, test: &Test) -> P { let fail_expr = match test.should_panic { ShouldPanic::No => ecx.expr_path(should_panic_path("No")), ShouldPanic::Yes(ref msg) => { - let path = should_panic_path("Yes"); - let arg = match *msg { - Some(ref msg) => ecx.expr_some(span, ecx.expr_str(span, msg.clone())), - None => ecx.expr_none(span), - }; - ecx.expr_call(span, ecx.expr_path(path), vec![arg]) + match *msg { + Some(ref msg) => { + let msg = ecx.expr_str(span, msg.clone()); + let path = should_panic_path("YesWithMessage"); + ecx.expr_call(span, ecx.expr_path(path), vec![msg]) + } + None => ecx.expr_path(should_panic_path("Yes")), + } } }; diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs index 194b6c8e3e2..7777ea51f82 100644 --- a/src/libtest/lib.rs +++ b/src/libtest/lib.rs @@ -197,7 +197,8 @@ pub struct Bencher { #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)] pub enum ShouldPanic { No, - Yes(Option<&'static str>) + Yes, + YesWithMessage(&'static str) } // The definition of a single test. A test runner will run a list of @@ -262,8 +263,8 @@ pub fn test_main(args: &[String], tests: Vec ) { // a Vec is used in order to effect ownership-transfer // semantics into parallel test runners, which in turn requires a Vec<> // rather than a &[]. -pub fn test_main_static(args: env::Args, tests: &[TestDescAndFn]) { - let args = args.collect::>(); +pub fn test_main_static(tests: &[TestDescAndFn]) { + let args = env::args().collect::>(); let owned_tests = tests.iter().map(|t| { match t.testfn { StaticTestFn(f) => TestDescAndFn { testfn: StaticTestFn(f), desc: t.desc.clone() }, @@ -1027,8 +1028,8 @@ pub fn run_test(opts: &TestOpts, fn calc_result(desc: &TestDesc, task_result: Result<(), Box>) -> TestResult { match (&desc.should_panic, task_result) { (&ShouldPanic::No, Ok(())) | - (&ShouldPanic::Yes(None), Err(_)) => TrOk, - (&ShouldPanic::Yes(Some(msg)), Err(ref err)) + (&ShouldPanic::Yes, Err(_)) => TrOk, + (&ShouldPanic::YesWithMessage(msg), Err(ref err)) if err.downcast_ref::() .map(|e| &**e) .or_else(|| err.downcast_ref::<&'static str>().map(|e| *e)) @@ -1276,7 +1277,7 @@ mod tests { desc: TestDesc { name: StaticTestName("whatever"), ignore: false, - should_panic: ShouldPanic::Yes(None) + should_panic: ShouldPanic::Yes, }, testfn: DynTestFn(Box::new(move|| f())), }; @@ -1293,7 +1294,7 @@ mod tests { desc: TestDesc { name: StaticTestName("whatever"), ignore: false, - should_panic: ShouldPanic::Yes(Some("error message")) + should_panic: ShouldPanic::YesWithMessage("error message"), }, testfn: DynTestFn(Box::new(move|| f())), }; @@ -1310,7 +1311,7 @@ mod tests { desc: TestDesc { name: StaticTestName("whatever"), ignore: false, - should_panic: ShouldPanic::Yes(Some("foobar")) + should_panic: ShouldPanic::YesWithMessage("foobar"), }, testfn: DynTestFn(Box::new(move|| f())), }; @@ -1327,7 +1328,7 @@ mod tests { desc: TestDesc { name: StaticTestName("whatever"), ignore: false, - should_panic: ShouldPanic::Yes(None) + should_panic: ShouldPanic::Yes, }, testfn: DynTestFn(Box::new(move|| f())), };