summary refs log tree commit diff
path: root/src/libstd/thread
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-03-23 15:13:15 -0700
committerAlex Crichton <alex@alexcrichton.com>2015-03-23 15:13:15 -0700
commitc608084ff595c9c31e78ad3cde07093e68ee1848 (patch)
treeb9b8d61635eb7b5cc12c738f4c60f868c1334a40 /src/libstd/thread
parentd8b06284ea88bdebdd95317e1313bd05a2ef5388 (diff)
parent8c93a79e387f5197e8b8fe73b3d87d2b101b7c4a (diff)
downloadrust-c608084ff595c9c31e78ad3cde07093e68ee1848.tar.gz
rust-c608084ff595c9c31e78ad3cde07093e68ee1848.zip
rollup merge of #23598: brson/gate
Conflicts:
	src/compiletest/compiletest.rs
	src/libcollections/lib.rs
	src/librustc_back/lib.rs
	src/libserialize/lib.rs
	src/libstd/lib.rs
	src/libtest/lib.rs
	src/test/run-make/rustdoc-default-impl/foo.rs
	src/test/run-pass/env-home-dir.rs
Diffstat (limited to 'src/libstd/thread')
-rw-r--r--src/libstd/thread/scoped.rs3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libstd/thread/scoped.rs b/src/libstd/thread/scoped.rs
index 2a8be2ad82c..d57535391fd 100644
--- a/src/libstd/thread/scoped.rs
+++ b/src/libstd/thread/scoped.rs
@@ -24,6 +24,7 @@
 //! # Examples
 //!
 //! ```
+//! # #![feature(std_misc)]
 //! scoped_thread_local!(static FOO: u32);
 //!
 //! // Initially each scoped slot is empty.
@@ -146,6 +147,7 @@ impl<T> ScopedKey<T> {
     /// # Examples
     ///
     /// ```
+    /// # #![feature(std_misc)]
     /// scoped_thread_local!(static FOO: u32);
     ///
     /// FOO.set(&100, || {
@@ -198,6 +200,7 @@ impl<T> ScopedKey<T> {
     /// # Examples
     ///
     /// ```no_run
+    /// # #![feature(std_misc)]
     /// scoped_thread_local!(static FOO: u32);
     ///
     /// FOO.with(|slot| {