diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2019-12-17 16:28:33 -0500 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2019-12-17 16:28:33 -0500 |
| commit | 7f00a5f26a4687c0c667d2ca02cb73eef677ae2e (patch) | |
| tree | 82ce6096679ca921b3eb76f24cf8480ecfc77802 /src/librustc_data_structures/sync.rs | |
| parent | 3ed3b8bb7b100afecf7d5f52eafbb70fec27f537 (diff) | |
| download | rust-7f00a5f26a4687c0c667d2ca02cb73eef677ae2e.tar.gz rust-7f00a5f26a4687c0c667d2ca02cb73eef677ae2e.zip | |
Revert "Auto merge of #67362 - Mark-Simulacrum:par-4-default, r=alexcrichton"
This reverts commit 3ed3b8bb7b100afecf7d5f52eafbb70fec27f537, reversing changes made to 99b89533d4cdf7682ea4054ad0ee36c351d05df1. We will reland a similar patch at a future date but for now we should get a nightly released in a few hours with the parallel patch, so this should be reverted to make sure that the next nightly is not parallel-enabled.
Diffstat (limited to 'src/librustc_data_structures/sync.rs')
| -rw-r--r-- | src/librustc_data_structures/sync.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/librustc_data_structures/sync.rs b/src/librustc_data_structures/sync.rs index c4aed0628ba..6a19f52897e 100644 --- a/src/librustc_data_structures/sync.rs +++ b/src/librustc_data_structures/sync.rs @@ -317,9 +317,7 @@ cfg_if! { pub use parking_lot::MutexGuard as LockGuard; pub use parking_lot::MappedMutexGuard as MappedLockGuard; - pub use std::sync::atomic::{AtomicBool, AtomicUsize, AtomicU32}; - #[cfg(target_has_atomic = "64")] - pub use std::sync::atomic::{AtomicU64}; + pub use std::sync::atomic::{AtomicBool, AtomicUsize, AtomicU32, AtomicU64}; pub use crossbeam_utils::atomic::AtomicCell; |