diff options
| author | bors <bors@rust-lang.org> | 2017-06-28 11:55:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-06-28 11:55:37 +0000 |
| commit | c16930762a4a7762b26579f7d44273d3bab4c11e (patch) | |
| tree | 06bb0b0d660adb3cca26948a5a17bd8742f702f6 /src/libstd/thread | |
| parent | 6b52a1162eff2469c0da88300577863e5cc0c78f (diff) | |
| parent | 143206d54d7558c2326212df99efc98110904fdb (diff) | |
| download | rust-c16930762a4a7762b26579f7d44273d3bab4c11e.tar.gz rust-c16930762a4a7762b26579f7d44273d3bab4c11e.zip | |
Auto merge of #42745 - sfackler:1.19-stabilization, r=alexcrichton
1.19 stabilization r? @alexcrichton
Diffstat (limited to 'src/libstd/thread')
| -rw-r--r-- | src/libstd/thread/mod.rs | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs index 743b7c3220a..f4fe52ca3b3 100644 --- a/src/libstd/thread/mod.rs +++ b/src/libstd/thread/mod.rs @@ -825,8 +825,6 @@ pub fn park_timeout(dur: Duration) { /// # Examples /// /// ``` -/// #![feature(thread_id)] -/// /// use std::thread; /// /// let other_thread = thread::spawn(|| { @@ -836,7 +834,7 @@ pub fn park_timeout(dur: Duration) { /// let other_thread_id = other_thread.join().unwrap(); /// assert!(thread::current().id() != other_thread_id); /// ``` -#[unstable(feature = "thread_id", issue = "21507")] +#[stable(feature = "thread_id", since = "1.19.0")] #[derive(Eq, PartialEq, Clone, Copy, Hash, Debug)] pub struct ThreadId(u64); @@ -966,8 +964,6 @@ impl Thread { /// # Examples /// /// ``` - /// #![feature(thread_id)] - /// /// use std::thread; /// /// let other_thread = thread::spawn(|| { @@ -977,7 +973,7 @@ impl Thread { /// let other_thread_id = other_thread.join().unwrap(); /// assert!(thread::current().id() != other_thread_id); /// ``` - #[unstable(feature = "thread_id", issue = "21507")] + #[stable(feature = "thread_id", since = "1.19.0")] pub fn id(&self) -> ThreadId { self.inner.id } @@ -1168,8 +1164,6 @@ impl<T> JoinHandle<T> { /// # Examples /// /// ``` - /// #![feature(thread_id)] - /// /// use std::thread; /// /// let builder = thread::Builder::new(); |
