diff options
| author | Nick Cameron <ncameron@mozilla.com> | 2014-12-29 16:52:10 +1300 |
|---|---|---|
| committer | Nick Cameron <ncameron@mozilla.com> | 2014-12-29 19:10:08 +1300 |
| commit | ac095351fba2750bddd84c3f434d16c1ed7f1640 (patch) | |
| tree | c7f11ff959dee86a2feb97dc8eeffde588e57eb2 /src/libstd/sync | |
| parent | 35dd33c7e24798e8acc030fc5bbf2ca372616bbf (diff) | |
| download | rust-ac095351fba2750bddd84c3f434d16c1ed7f1640.tar.gz rust-ac095351fba2750bddd84c3f434d16c1ed7f1640.zip | |
Fallout from globs/re-export/shadowing change
Diffstat (limited to 'src/libstd/sync')
| -rw-r--r-- | src/libstd/sync/atomic.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sync/atomic.rs b/src/libstd/sync/atomic.rs index 26778ef70b3..bdf947438f3 100644 --- a/src/libstd/sync/atomic.rs +++ b/src/libstd/sync/atomic.rs @@ -180,7 +180,7 @@ impl<T: Send> Drop for AtomicOption<T> { #[cfg(test)] mod test { - use prelude::*; + use prelude::{Some, None}; use super::*; #[test] |