about summary refs log tree commit diff
path: root/src/libstd/thread
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-07-30 08:53:22 -0700
committerAlex Crichton <alex@alexcrichton.com>2015-08-04 14:02:36 -0700
commit0d8340327c03f319b49cb91e2e64aa66dd1e76c7 (patch)
tree308af0af76da6c6a020ee5e8d9e5dbb40152307a /src/libstd/thread
parent5cccf3cd256420d9f32c265e83036dea1d5f94d8 (diff)
downloadrust-0d8340327c03f319b49cb91e2e64aa66dd1e76c7.tar.gz
rust-0d8340327c03f319b49cb91e2e64aa66dd1e76c7.zip
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.
Diffstat (limited to 'src/libstd/thread')
-rw-r--r--src/libstd/thread/local.rs1
1 files changed, 1 insertions, 0 deletions
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;