Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade to rustc 1.21.0-nightly (599be0d18 2017-07-26)

Browse source
This commit is contained in:
Simon Sapin 2017-07-27 02:21:01 +02:00
parent 27031b996b
commit a205c82264
20 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/remutex/lib.rs
View file

@ -35,7 +35,7 @@ impl ThreadId {
#[allow(unsafe_code)]
fn new() -> ThreadId {
let number = THREAD_COUNT.fetch_add(1, Ordering::SeqCst);
ThreadId(unsafe { NonZero::new(number) })
ThreadId(NonZero::new(number).unwrap())
}
pub fn current() -> ThreadId {
THREAD_ID.with(|tls| tls.clone())
@ -59,13 +59,13 @@ impl AtomicOptThreadId {
#[allow(unsafe_code)]
pub fn load(&self, ordering: Ordering) -> Option<ThreadId> {
let number = self.0.load(ordering);
if number == 0 { None } else { Some(ThreadId(unsafe { NonZero::new(number) })) }
NonZero::new(number).map(ThreadId)
}
#[allow(unsafe_code)]
pub fn swap(&self, value: Option<ThreadId>, ordering: Ordering) -> Option<ThreadId> {
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) })) }
NonZero::new(number).map(ThreadId)
}
}