diff options
| author | Aaron Turon <aturon@mozilla.com> | 2015-01-05 21:59:45 -0800 |
|---|---|---|
| committer | Aaron Turon <aturon@mozilla.com> | 2015-01-06 14:57:52 -0800 |
| commit | caca9b2e7109a148d100a3c6851241d3815da3db (patch) | |
| tree | b49ae965c7392d0c527aba9c427d4e9e224f8750 /src/libstd/thread_local | |
| parent | f67b81e8d4dc198ad10ad50a7624e43cc1e25802 (diff) | |
| download | rust-caca9b2e7109a148d100a3c6851241d3815da3db.tar.gz rust-caca9b2e7109a148d100a3c6851241d3815da3db.zip | |
Fallout from stabilization
Diffstat (limited to 'src/libstd/thread_local')
| -rw-r--r-- | src/libstd/thread_local/mod.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/thread_local/mod.rs b/src/libstd/thread_local/mod.rs index e0cbaa8ca50..c8cad7765e6 100644 --- a/src/libstd/thread_local/mod.rs +++ b/src/libstd/thread_local/mod.rs @@ -87,7 +87,7 @@ pub mod __impl { /// assert_eq!(*f.borrow(), 1); /// *f.borrow_mut() = 3; /// }); -/// }).detach(); +/// }); /// /// // we retain our original value of 2 despite the child thread /// FOO.with(|f| { @@ -581,7 +581,7 @@ mod tests { } thread_local!(static FOO: Foo = foo()); - Thread::spawn(|| { + Thread::scoped(|| { assert!(FOO.state() == State::Uninitialized); FOO.with(|_| { assert!(FOO.state() == State::Valid); @@ -645,7 +645,7 @@ mod tests { } } - Thread::spawn(move|| { + Thread::scoped(move|| { drop(S1); }).join().ok().unwrap(); } @@ -663,7 +663,7 @@ mod tests { } } - Thread::spawn(move|| unsafe { + Thread::scoped(move|| unsafe { K1.with(|s| *s.get() = Some(S1)); }).join().ok().unwrap(); } |
