bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Make Option<ThreadId> no larger than ThreadId, with NonZeroU64

Browse source
This commit is contained in:
Simon Sapin 2019-03-19 13:59:38 +01:00
parent 0f88167f89
commit 8cf720bd19
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libstd/thread/mod.rs
View file

@ -163,6 +163,7 @@ use crate::ffi::{CStr, CString};
use crate::fmt; use crate::fmt;
use crate::io; use crate::io;
use crate::mem; use crate::mem;
use crate::num::NonZeroU64;
use crate::panic; use crate::panic;
use crate::panicking; use crate::panicking;
use crate::str; use crate::str;
@ -1036,7 +1037,7 @@ pub fn park_timeout(dur: Duration) {
/// [`Thread`]: ../../std/thread/struct.Thread.html /// [`Thread`]: ../../std/thread/struct.Thread.html
#[stable(feature = "thread_id", since = "1.19.0")] #[stable(feature = "thread_id", since = "1.19.0")]
#[derive(Eq, PartialEq, Clone, Copy, Hash, Debug)] #[derive(Eq, PartialEq, Clone, Copy, Hash, Debug)]
pub struct ThreadId(u64); pub struct ThreadId(NonZeroU64);
impl ThreadId { impl ThreadId {
// Generate a new unique thread ID. // Generate a new unique thread ID.
@ -1044,7 +1045,7 @@ impl ThreadId {
// We never call `GUARD.init()`, so it is UB to attempt to // We never call `GUARD.init()`, so it is UB to attempt to
// acquire this mutex reentrantly! // acquire this mutex reentrantly!
static GUARD: mutex::Mutex = mutex::Mutex::new(); static GUARD: mutex::Mutex = mutex::Mutex::new();
static mut COUNTER: u64 = 0; static mut COUNTER: u64 = 1;
unsafe { unsafe {
let _guard = GUARD.lock(); let _guard = GUARD.lock();
@ -1058,7 +1059,7 @@ impl ThreadId {
let id = COUNTER; let id = COUNTER;
COUNTER += 1; COUNTER += 1;
ThreadId(id) ThreadId(NonZeroU64::new(id).unwrap())
} }
} }
} }