Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-10 09:33:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade to rustc 1.19.0-nightly (ced823e26 2017-05-07)

Browse source
This commit is contained in:
Simon Sapin 2017-05-07 16:42:46 +02:00
parent bd2cd40c50
commit 02e1901bc1
10 changed files with 37 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/remutex/lib.rs
View file

@ -53,7 +53,7 @@ impl AtomicOptThreadId {
AtomicOptThreadId(AtomicUsize::new(0))
}
pub fn store(&self, value: Option<ThreadId>, ordering: Ordering) {
let number = value.map(|id| *id.0).unwrap_or(0);
let number = value.map(|id| id.0.get()).unwrap_or(0);
self.0.store(number, ordering);
}
#[allow(unsafe_code)]
@ -63,7 +63,7 @@ impl AtomicOptThreadId {
}
#[allow(unsafe_code)]
pub fn swap(&self, value: Option<ThreadId>, ordering: Ordering) -> Option<ThreadId> {
let number = value.map(|id| *id.0).unwrap_or(0);
let number = value.map(|id| id.0.get()).unwrap_or(0);
let number = self.0.swap(number, ordering);
if number == 0 { None } else { Some(ThreadId(unsafe { NonZero::new(number) })) }
}