about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorAriel Ben-Yehuda <arielb1@mail.tau.ac.il>2015-09-26 02:52:46 +0300
committerAriel Ben-Yehuda <ariel.byd@gmail.com>2015-10-02 23:40:10 +0300
commitce70207250cf4397211939153826d6959f1133fa (patch)
treeccd667c2cd0af7c6e7c28433613138f40c29ac9e /src/libstd
parent603a75c8eaa8ee168e4333e4fba5eb782ed7192b (diff)
downloadrust-ce70207250cf4397211939153826d6959f1133fa.tar.gz
rust-ce70207250cf4397211939153826d6959f1133fa.zip
fix fallout
looks like some mix of #18653 and `projection_must_outlive`, but
that needs to be investigated further (crater run?)
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/thread/mod.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs
index 43c23ec8a47..134b1ce16e2 100644
--- a/src/libstd/thread/mod.rs
+++ b/src/libstd/thread/mod.rs
@@ -266,7 +266,8 @@ impl Builder {
         let my_thread = Thread::new(name);
         let their_thread = my_thread.clone();
 
-        let my_packet = Arc::new(UnsafeCell::new(None));
+        let my_packet : Arc<UnsafeCell<Option<Result<T>>>>
+            = Arc::new(UnsafeCell::new(None));
         let their_packet = my_packet.clone();
 
         let main = move || {