about summary refs log tree commit diff
path: root/src/libstd/sync
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-07-30 18:42:32 +0000
committerbors <bors@rust-lang.org>2015-07-30 18:42:32 +0000
commit6edc994021a6bb1922ef77f62841f01a7bdf235d (patch)
treeb2b212bf9cbd4b24849d7774cdb3f1d97d7d2420 /src/libstd/sync
parent28869d45dd1d3ba04e17dec82408f9f3c548e776 (diff)
parent5af6cf9fa422cb492525e139752a57d2d89f42c7 (diff)
downloadrust-6edc994021a6bb1922ef77f62841f01a7bdf235d.tar.gz
rust-6edc994021a6bb1922ef77f62841f01a7bdf235d.zip
Auto merge of #27388 - alexcrichton:remove-curious-inner, r=brson
This isn't actually necessary any more with the advent of `$crate` and changes
in the compiler to expand macros to `::core::$foo` in the context of a
`#![no_std]` crate.

The libcore inner module was also trimmed down a bit to the bare bones.
Diffstat (limited to 'src/libstd/sync')
-rw-r--r--src/libstd/sync/mpsc/mod.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/sync/mpsc/mod.rs b/src/libstd/sync/mpsc/mod.rs
index 1453c91fd4d..d80d858e7a9 100644
--- a/src/libstd/sync/mpsc/mod.rs
+++ b/src/libstd/sync/mpsc/mod.rs
@@ -1107,7 +1107,7 @@ impl error::Error for TryRecvError {
 mod tests {
     use prelude::v1::*;
 
-    use std::env;
+    use env;
     use super::*;
     use thread;
 
@@ -1655,7 +1655,7 @@ mod tests {
 mod sync_tests {
     use prelude::v1::*;
 
-    use std::env;
+    use env;
     use thread;
     use super::*;