user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Auto merge of #67362 - Mark-Simulacrum:par-4-default, r=alexcrichton"

Browse source 
This reverts commit 3ed3b8bb7b, reversing
changes made to 99b89533d4.

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.
This commit is contained in:
Mark Rousskov 2019-12-17 16:28:33 -05:00
parent 3ed3b8bb7b
commit 7f00a5f26a
9 changed files with 50 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustc_data_structures/sync.rs
View file

@ -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;