about summary refs log tree commit diff
path: root/src/liballoc/task.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-06-29 16:48:57 +0000
committerbors <bors@rust-lang.org>2018-06-29 16:48:57 +0000
commit2c1a715cbda1d6eba39625aca08f1f2ac7c0dcc8 (patch)
tree9756750b94ea91185e1a174ae850b2607252f2f7 /src/liballoc/task.rs
parent5fdcd3aa389aa92879f576c55e429015667143c3 (diff)
parent15bb6c431da6f486fd048a00ba9c72fe5bc2dd74 (diff)
downloadrust-2c1a715cbda1d6eba39625aca08f1f2ac7c0dcc8.tar.gz
rust-2c1a715cbda1d6eba39625aca08f1f2ac7c0dcc8.zip
Auto merge of #51569 - SimonSapin:liballoc, r=sfackler
Make the public API of the alloc crate a subset of std

This only affects **unstable** APIs.

I plan to submit an RFC proposing to stabilize the crate. The reason it isn’t stable yet (https://github.com/rust-lang/rust/issues/27783) is in case we end up merging the standard library crates into one. However the `core` crate is already stable, so if that happens we’ll need to keep it working somehow (likely by making replacing its contents by `pub use` items). We can do the same for `alloc`. This PR will hopefully make this easier, but even if that doesn’t happen consistency with `std` seems good.
Diffstat (limited to 'src/liballoc/task.rs')
-rw-r--r--src/liballoc/task.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc/task.rs b/src/liballoc/task.rs
index 7b1947b56b8..f14fe3a20da 100644
--- a/src/liballoc/task.rs
+++ b/src/liballoc/task.rs
@@ -18,10 +18,10 @@ pub use self::if_arc::*;
 #[cfg(target_has_atomic = "ptr")]
 mod if_arc {
     use super::*;
-    use arc::Arc;
     use core::marker::PhantomData;
     use core::mem;
     use core::ptr::{self, NonNull};
+    use sync::Arc;
 
     /// A way of waking up a specific task.
     ///