auto merge of #10709 : alexcrichton/rust/snapshot, r=pcwalton

5 files changed, 9 insertions, 10 deletions

diff --git a/src/libstd/rt/context.rs b/src/libstd/rt/context.rs
index 8998064990a..418557f659b 100644
--- a/src/libstd/rt/context.rs
+++ b/src/libstd/rt/context.rs
@@ -97,10 +97,10 @@ impl Context {
     pub fn swap(out_context: &mut Context, in_context: &Context) {
         rtdebug!("swapping contexts");
         let out_regs: &mut Registers = match out_context {
-            &Context { regs: ~ref mut r, _ } => r
+            &Context { regs: ~ref mut r, .. } => r
         };
         let in_regs: &Registers = match in_context {
-            &Context { regs: ~ref r, _ } => r
+            &Context { regs: ~ref r, .. } => r
         };
 
         rtdebug!("noting the stack limit and doing raw swap");
diff --git a/src/libstd/rt/local_ptr.rs b/src/libstd/rt/local_ptr.rs
index c50a9778d33..803938589af 100644
--- a/src/libstd/rt/local_ptr.rs
+++ b/src/libstd/rt/local_ptr.rs
@@ -21,10 +21,9 @@ use unstable::finally::Finally;
 
 #[cfg(windows)]               // mingw-w32 doesn't like thread_local things
 #[cfg(target_os = "android")] // see #10686
-#[cfg(stage0)] // only remove this attribute after the next snapshot
 pub use self::native::*;
 
-#[cfg(not(stage0), not(windows), not(target_os = "android"))]
+#[cfg(not(windows), not(target_os = "android"))]
 pub use self::compiled::*;
 
 /// Borrow the thread-local value from thread-local storage.
diff --git a/src/libstd/rt/mod.rs b/src/libstd/rt/mod.rs
index 0c69315b27d..78ec32ead3c 100644
--- a/src/libstd/rt/mod.rs
+++ b/src/libstd/rt/mod.rs
@@ -96,7 +96,7 @@ pub mod shouldnt_be_public {
     pub use super::select::SelectInner;
     pub use super::select::{SelectInner, SelectPortInner};
     pub use super::local_ptr::native::maybe_tls_key;
-    #[cfg(not(stage0), not(windows), not(target_os = "android"))]
+    #[cfg(not(windows), not(target_os = "android"))]
     pub use super::local_ptr::compiled::RT_TLS_PTR;
 }
 
diff --git a/src/libstd/rt/sched.rs b/src/libstd/rt/sched.rs
index 21753d9e4d9..d66bd1e4135 100644
--- a/src/libstd/rt/sched.rs
+++ b/src/libstd/rt/sched.rs
@@ -588,7 +588,7 @@ impl Scheduler {
                 transmute_mut_region(*next_task.sched.get_mut_ref());
 
             let current_task: &mut Task = match sched.cleanup_job {
-                Some(CleanupJob { task: ref task, _ }) => {
+                Some(CleanupJob { task: ref task, .. }) => {
                     let task_ptr: *~Task = task;
                     transmute_mut_region(*transmute_mut_unsafe(task_ptr))
                 }
diff --git a/src/libstd/rt/task.rs b/src/libstd/rt/task.rs
index 68164eb9345..e5f7c08912a 100644
--- a/src/libstd/rt/task.rs
+++ b/src/libstd/rt/task.rs
@@ -335,7 +335,7 @@ impl Task {
     pub fn is_home_no_tls(&self, sched: &~Scheduler) -> bool {
         match self.task_type {
             GreenTask(Some(AnySched)) => { false }
-            GreenTask(Some(Sched(SchedHandle { sched_id: ref id, _}))) => {
+            GreenTask(Some(Sched(SchedHandle { sched_id: ref id, .. }))) => {
                 *id == sched.sched_id()
             }
             GreenTask(None) => {
@@ -351,7 +351,7 @@ impl Task {
     pub fn homed(&self) -> bool {
         match self.task_type {
             GreenTask(Some(AnySched)) => { false }
-            GreenTask(Some(Sched(SchedHandle { _ }))) => { true }
+            GreenTask(Some(Sched(SchedHandle { .. }))) => { true }
             GreenTask(None) => {
                 rtabort!("task without home");
             }
@@ -372,7 +372,7 @@ impl Task {
                     rtdebug!("anysched task in sched check ****");
                     sched_run_anything
                 }
-                GreenTask(Some(Sched(SchedHandle { sched_id: ref id, _ }))) => {
+                GreenTask(Some(Sched(SchedHandle { sched_id: ref id, ..}))) => {
                     rtdebug!("homed task in sched check ****");
                     *id == sched_id
                 }
@@ -470,7 +470,7 @@ impl Coroutine {
     /// Destroy coroutine and try to reuse stack segment.
     pub fn recycle(self, stack_pool: &mut StackPool) {
         match self {
-            Coroutine { current_stack_segment, _ } => {
+            Coroutine { current_stack_segment, .. } => {
                 stack_pool.give_segment(current_stack_segment);
             }
         }