diff options
| author | bors <bors@rust-lang.org> | 2019-02-28 11:38:40 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-02-28 11:38:40 +0000 |
| commit | 190feb65290d39d7ab6d44e994bd99188d339f16 (patch) | |
| tree | 0dc440124b61d17495c4b8e4e680b38cd7b0fa13 /src/libstd/sync/mpsc/spsc_queue.rs | |
| parent | 7e001e5c6c7c090b41416a57d4be412ed3ccd937 (diff) | |
| parent | aad9e29f52988c55cd8cee2bd181a2e3c9d436a4 (diff) | |
| download | rust-190feb65290d39d7ab6d44e994bd99188d339f16.tar.gz rust-190feb65290d39d7ab6d44e994bd99188d339f16.zip | |
Auto merge of #58208 - taiki-e:libstd-2018, r=Centril
libstd => 2018 Transitions `libstd` to Rust 2018; cc #58099 r? @Centril
Diffstat (limited to 'src/libstd/sync/mpsc/spsc_queue.rs')
| -rw-r--r-- | src/libstd/sync/mpsc/spsc_queue.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libstd/sync/mpsc/spsc_queue.rs b/src/libstd/sync/mpsc/spsc_queue.rs index b43ccf074a4..0edb1c24e80 100644 --- a/src/libstd/sync/mpsc/spsc_queue.rs +++ b/src/libstd/sync/mpsc/spsc_queue.rs @@ -6,11 +6,11 @@ // http://www.1024cores.net/home/lock-free-algorithms/queues/unbounded-spsc-queue -use boxed::Box; use core::ptr; use core::cell::UnsafeCell; -use sync::atomic::{AtomicPtr, AtomicUsize, Ordering}; +use crate::boxed::Box; +use crate::sync::atomic::{AtomicPtr, AtomicUsize, Ordering}; use super::cache_aligned::CacheAligned; @@ -233,10 +233,10 @@ impl<T, ProducerAddition, ConsumerAddition> Drop for Queue<T, ProducerAddition, #[cfg(all(test, not(target_os = "emscripten")))] mod tests { - use sync::Arc; use super::Queue; - use thread; - use sync::mpsc::channel; + use crate::sync::Arc; + use crate::thread; + use crate::sync::mpsc::channel; #[test] fn smoke() { |
