diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-12-29 16:36:49 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-12-29 16:36:49 -0800 |
| commit | 806cb35f4de0705c4dd20ed8f6f6ccc384905870 (patch) | |
| tree | d95e11aaf6290cb70075d0a11cf89b23ec6b26fd /src/libstd/sync | |
| parent | d7a09cb2fdf3084ab22c3b23bd4d8c32a187a674 (diff) | |
| parent | 9dce83ccd9234dbc6228bdac6074c0414c6e7b05 (diff) | |
| download | rust-806cb35f4de0705c4dd20ed8f6f6ccc384905870.tar.gz rust-806cb35f4de0705c4dd20ed8f6f6ccc384905870.zip | |
rollup merge of #20289: nick29581/shadowing
r? eddyb
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] |