diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-21 09:23:27 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-21 10:32:56 -0800 |
| commit | 4ffde0814f43076c944f46890e0b6d401de92ca4 (patch) | |
| tree | 4b1c7d0612d0901a4746724b103d61ef2a7cee0a /src/libstd/sync | |
| parent | 9c999c797c12f3f79482f0f4f416567b6bcc2a63 (diff) | |
| download | rust-4ffde0814f43076c944f46890e0b6d401de92ca4.tar.gz rust-4ffde0814f43076c944f46890e0b6d401de92ca4.zip | |
Test fixes and rebase conflicts
Diffstat (limited to 'src/libstd/sync')
| -rw-r--r-- | src/libstd/sync/mpsc/mod.rs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/libstd/sync/mpsc/mod.rs b/src/libstd/sync/mpsc/mod.rs index 96b1636667e..062bdf346cd 100644 --- a/src/libstd/sync/mpsc/mod.rs +++ b/src/libstd/sync/mpsc/mod.rs @@ -319,8 +319,6 @@ use prelude::v1::*; use sync::Arc; use fmt; -#[cfg(stage0)] // NOTE remove use after next snapshot -use marker; use mem; use cell::UnsafeCell; |