diff options
| author | bors <bors@rust-lang.org> | 2018-06-29 16:48:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-06-29 16:48:57 +0000 |
| commit | 2c1a715cbda1d6eba39625aca08f1f2ac7c0dcc8 (patch) | |
| tree | 9756750b94ea91185e1a174ae850b2607252f2f7 /src/libstd/sync | |
| parent | 5fdcd3aa389aa92879f576c55e429015667143c3 (diff) | |
| parent | 15bb6c431da6f486fd048a00ba9c72fe5bc2dd74 (diff) | |
| download | rust-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/libstd/sync')
| -rw-r--r-- | src/libstd/sync/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sync/mod.rs b/src/libstd/sync/mod.rs index 642b284c6c7..e12ef8d9eda 100644 --- a/src/libstd/sync/mod.rs +++ b/src/libstd/sync/mod.rs @@ -18,7 +18,7 @@ #![stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")] -pub use alloc_crate::arc::{Arc, Weak}; +pub use alloc_crate::sync::{Arc, Weak}; #[stable(feature = "rust1", since = "1.0.0")] pub use core::sync::atomic; |