diff options
| author | John Kåre Alsaker <john.kare.alsaker@gmail.com> | 2018-04-20 23:50:10 +0200 |
|---|---|---|
| committer | John Kåre Alsaker <john.kare.alsaker@gmail.com> | 2018-06-01 14:55:54 +0200 |
| commit | d6c63ec949c09e30f89f4bc63b42f7822c197b2b (patch) | |
| tree | a03396b631a738fc1c1db65aa26829fb2b283241 /src/librustc_data_structures | |
| parent | 577a5b2703d97e5408664e409f35768944360fea (diff) | |
| download | rust-d6c63ec949c09e30f89f4bc63b42f7822c197b2b.tar.gz rust-d6c63ec949c09e30f89f4bc63b42f7822c197b2b.zip | |
Fix OneThread
Diffstat (limited to 'src/librustc_data_structures')
| -rw-r--r-- | src/librustc_data_structures/sync.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/librustc_data_structures/sync.rs b/src/librustc_data_structures/sync.rs index 36617631330..9cceee65bf9 100644 --- a/src/librustc_data_structures/sync.rs +++ b/src/librustc_data_structures/sync.rs @@ -36,7 +36,6 @@ use std::marker::PhantomData; use std::fmt::Debug; use std::fmt::Formatter; use std::fmt; -use std; use std::ops::{Deref, DerefMut}; use owning_ref::{Erased, OwningRef}; @@ -200,6 +199,7 @@ cfg_if! { use parking_lot::Mutex as InnerLock; use parking_lot::RwLock as InnerRwLock; + use std; use std::thread; pub use rayon::{join, scope}; @@ -638,7 +638,9 @@ pub struct OneThread<T> { inner: T, } +#[cfg(parallel_queries)] unsafe impl<T> std::marker::Sync for OneThread<T> {} +#[cfg(parallel_queries)] unsafe impl<T> std::marker::Send for OneThread<T> {} impl<T> OneThread<T> { |