about summary refs log tree commit diff
path: root/src/libstd/rt/thread.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-10-29 02:01:50 -0700
committerbors <bors@rust-lang.org>2013-10-29 02:01:50 -0700
commit73091583dd42991213e102daefa9181ce500feb0 (patch)
treed419506d83e62e8f3717edb2791be3a3c00b0555 /src/libstd/rt/thread.rs
parent671ab42a3b86addf7b90ff126554a092579e589a (diff)
parent2290131543af4da764343c546efbd5c6dc9e7d71 (diff)
downloadrust-73091583dd42991213e102daefa9181ce500feb0.tar.gz
rust-73091583dd42991213e102daefa9181ce500feb0.zip
auto merge of #10135 : alexcrichton/rust/snapshots, r=thestinger
Plus some migration from `let mut this = self` to `mut self` (yay!)
Diffstat (limited to 'src/libstd/rt/thread.rs')
-rw-r--r--src/libstd/rt/thread.rs7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/libstd/rt/thread.rs b/src/libstd/rt/thread.rs
index 949d73ecc4f..a3731e0b57a 100644
--- a/src/libstd/rt/thread.rs
+++ b/src/libstd/rt/thread.rs
@@ -55,13 +55,12 @@ impl Thread {
         }
     }
 
-    pub fn join(self) {
+    pub fn join(mut self) {
         #[fixed_stack_segment]; #[inline(never)];
 
         assert!(!self.joined);
-        let mut this = self;
-        unsafe { rust_raw_thread_join(this.raw_thread); }
-        this.joined = true;
+        unsafe { rust_raw_thread_join(self.raw_thread); }
+        self.joined = true;
     }
 }