diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-03-23 15:54:39 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-03-23 17:10:19 -0700 |
| commit | 29b54387b88bdf43c00849e3483c2297723f5a73 (patch) | |
| tree | 72d467004da043e823a94690e89e3a2afae8ba2f /src/libstd/thread | |
| parent | 3112716f123bc0f6f69c4df26894241f41c488ce (diff) | |
| download | rust-29b54387b88bdf43c00849e3483c2297723f5a73.tar.gz rust-29b54387b88bdf43c00849e3483c2297723f5a73.zip | |
Test fixes and rebase conflicts, round 2
Diffstat (limited to 'src/libstd/thread')
| -rw-r--r-- | src/libstd/thread/scoped.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/thread/scoped.rs b/src/libstd/thread/scoped.rs index d57535391fd..b384879d7a9 100644 --- a/src/libstd/thread/scoped.rs +++ b/src/libstd/thread/scoped.rs @@ -24,7 +24,7 @@ //! # Examples //! //! ``` -//! # #![feature(std_misc)] +//! # #![feature(scoped_tls)] //! scoped_thread_local!(static FOO: u32); //! //! // Initially each scoped slot is empty. @@ -147,7 +147,7 @@ impl<T> ScopedKey<T> { /// # Examples /// /// ``` - /// # #![feature(std_misc)] + /// # #![feature(scoped_tls)] /// scoped_thread_local!(static FOO: u32); /// /// FOO.set(&100, || { @@ -200,7 +200,7 @@ impl<T> ScopedKey<T> { /// # Examples /// /// ```no_run - /// # #![feature(std_misc)] + /// # #![feature(scoped_tls)] /// scoped_thread_local!(static FOO: u32); /// /// FOO.with(|slot| { |