diff options
| author | FenrirWolf <[email protected]> | 2018-04-21 16:39:03 -0600 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-04-21 16:39:03 -0600 |
| commit | 159b5b9e62ce074bbbd1900137670a9f5426a8bd (patch) | |
| tree | 4fecd0ca00b754c494e96b13e9837db48de93109 /ctr-std/src/sync/mpsc | |
| parent | Move more implementation details to `imp` module (diff) | |
| parent | Update for Rust nightly 2018-04-19 (diff) | |
| download | ctru-rs-159b5b9e62ce074bbbd1900137670a9f5426a8bd.tar.xz ctru-rs-159b5b9e62ce074bbbd1900137670a9f5426a8bd.zip | |
Merge pull request #64 from FenrirWolf/nightly-update
Update for Rust nightly 2018-04-19
Diffstat (limited to 'ctr-std/src/sync/mpsc')
| -rw-r--r-- | ctr-std/src/sync/mpsc/mpsc_queue.rs | 3 | ||||
| -rw-r--r-- | ctr-std/src/sync/mpsc/spsc_queue.rs | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/ctr-std/src/sync/mpsc/mpsc_queue.rs b/ctr-std/src/sync/mpsc/mpsc_queue.rs index 296773d..df945ac 100644 --- a/ctr-std/src/sync/mpsc/mpsc_queue.rs +++ b/ctr-std/src/sync/mpsc/mpsc_queue.rs @@ -23,10 +23,9 @@ pub use self::PopResult::*; -use alloc::boxed::Box; use core::ptr; use core::cell::UnsafeCell; - +use boxed::Box; use sync::atomic::{AtomicPtr, Ordering}; /// A result of the `pop` function. diff --git a/ctr-std/src/sync/mpsc/spsc_queue.rs b/ctr-std/src/sync/mpsc/spsc_queue.rs index cc4be92..9482f69 100644 --- a/ctr-std/src/sync/mpsc/spsc_queue.rs +++ b/ctr-std/src/sync/mpsc/spsc_queue.rs @@ -16,7 +16,7 @@ // http://www.1024cores.net/home/lock-free-algorithms/queues/unbounded-spsc-queue -use alloc::boxed::Box; +use boxed::Box; use core::ptr; use core::cell::UnsafeCell; |