From a279d6510251ebd3956c74ffe4b12bd49074da9c Mon Sep 17 00:00:00 2001
From: Corey Richardson <corey@octayn.net>
Date: Sat, 11 May 2013 06:07:21 -0400
Subject: [PATCH] clean up the last bit of warnings

---
 src/libcore/condition.rs                             | 1 -
 src/libcore/os.rs                                    | 1 -
 src/libcore/rand.rs                                  | 1 -
 src/librustc/middle/borrowck/mod.rs                  | 3 ++-
 src/librustc/middle/ty.rs                            | 3 ++-
 src/librustc/middle/typeck/infer/region_inference.rs | 3 ++-
 src/libstd/fileinput.rs                              | 8 ++++----
 src/libstd/test.rs                                   | 2 +-
 src/libsyntax/ast.rs                                 | 1 -
 9 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/libcore/condition.rs b/src/libcore/condition.rs
index 75c6cf0e969..baa6722b193 100644
--- a/src/libcore/condition.rs
+++ b/src/libcore/condition.rs
@@ -11,7 +11,6 @@
 /*! Condition handling */
 
 use prelude::*;
-use task;
 use local_data::{local_data_pop, local_data_set};
 
 // helper for transmutation, shown below.
diff --git a/src/libcore/os.rs b/src/libcore/os.rs
index 88b13d0ff59..030b7ec3e42 100644
--- a/src/libcore/os.rs
+++ b/src/libcore/os.rs
@@ -36,7 +36,6 @@ use option::{Some, None};
 use prelude::*;
 use ptr;
 use str;
-use task;
 use uint;
 use unstable::finally::Finally;
 use vec;
diff --git a/src/libcore/rand.rs b/src/libcore/rand.rs
index addc92c3a00..daf0b9d094a 100644
--- a/src/libcore/rand.rs
+++ b/src/libcore/rand.rs
@@ -43,7 +43,6 @@ fn main () {
 use int;
 use prelude::*;
 use str;
-use task;
 use u32;
 use uint;
 use util;
diff --git a/src/librustc/middle/borrowck/mod.rs b/src/librustc/middle/borrowck/mod.rs
index a6105534077..fbc186a6fd4 100644
--- a/src/librustc/middle/borrowck/mod.rs
+++ b/src/librustc/middle/borrowck/mod.rs
@@ -21,7 +21,8 @@ use middle::dataflow::DataFlowOperator;
 use util::common::stmt_set;
 use util::ppaux::{note_and_explain_region, Repr};
 
-use core;
+#[cfg(stage0)]
+use core; // NOTE: this can be removed after the next snapshot
 use core::hashmap::{HashSet, HashMap};
 use core::io;
 use core::result::{Result};
diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs
index 7e355f7192f..f5adb2fe108 100644
--- a/src/librustc/middle/ty.rs
+++ b/src/librustc/middle/ty.rs
@@ -28,7 +28,8 @@ use util::ppaux::Repr;
 use util::common::{indenter};
 use util::enum_set::{EnumSet, CLike};
 
-use core;
+#[cfg(stage0)]
+use core; // NOTE: this can be removed after the next snapshot
 use core::ptr::to_unsafe_ptr;
 use core::to_bytes;
 use core::hashmap::{HashMap, HashSet};
diff --git a/src/librustc/middle/typeck/infer/region_inference.rs b/src/librustc/middle/typeck/infer/region_inference.rs
index 11a7aafe1cd..96e289bc497 100644
--- a/src/librustc/middle/typeck/infer/region_inference.rs
+++ b/src/librustc/middle/typeck/infer/region_inference.rs
@@ -544,7 +544,8 @@ use middle::typeck::infer::cres;
 use util::common::indenter;
 use util::ppaux::note_and_explain_region;
 
-use core;
+#[cfg(stage0)]
+use core; // NOTE: this can be removed after next snapshot
 use core::cell::{Cell, empty_cell};
 use core::hashmap::{HashMap, HashSet};
 use core::to_bytes;
diff --git a/src/libstd/fileinput.rs b/src/libstd/fileinput.rs
index 4e205b50014..c3622fad53b 100644
--- a/src/libstd/fileinput.rs
+++ b/src/libstd/fileinput.rs
@@ -389,7 +389,7 @@ Fails when attempting to read from a file that can't be opened.
 */
 #[cfg(not(stage0))]
 pub fn input(f: &fn(&str) -> bool) -> bool {
-    let mut i = FileInput::from_args();
+    let i = FileInput::from_args();
     i.each_line(f)
 }
 
@@ -413,7 +413,7 @@ Fails when attempting to read from a file that can't be opened.
 */
 #[cfg(not(stage0))]
 pub fn input_state(f: &fn(&str, FileInputState) -> bool) -> bool {
-    let mut i = FileInput::from_args();
+    let i = FileInput::from_args();
     i.each_line_state(f)
 }
 
@@ -433,7 +433,7 @@ Fails when attempting to read from a file that can't be opened.
 */
 #[cfg(not(stage0))]
 pub fn input_vec(files: ~[Option<Path>], f: &fn(&str) -> bool) -> bool {
-    let mut i = FileInput::from_vec(files);
+    let i = FileInput::from_vec(files);
     i.each_line(f)
 }
 
@@ -457,7 +457,7 @@ Fails when attempting to read from a file that can't be opened.
 #[cfg(not(stage0))]
 pub fn input_vec_state(files: ~[Option<Path>],
                        f: &fn(&str, FileInputState) -> bool) -> bool {
-    let mut i = FileInput::from_vec(files);
+    let i = FileInput::from_vec(files);
     i.each_line_state(f)
 }
 
diff --git a/src/libstd/test.rs b/src/libstd/test.rs
index bb90b783444..71cbc0d7a6a 100644
--- a/src/libstd/test.rs
+++ b/src/libstd/test.rs
@@ -412,7 +412,7 @@ fn run_tests(opts: &TestOpts,
              callback: @fn(e: TestEvent)) {
 
     let filtered_tests = filter_tests(opts, tests);
-    let filtered_descs = filtered_tests.map(|t| t.desc);
+    let filtered_descs = filtered_tests.map(|t| copy t.desc);
 
     callback(TeFiltered(filtered_descs));
 
diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs
index 8aa59fd1775..5daa0de2272 100644
--- a/src/libsyntax/ast.rs
+++ b/src/libsyntax/ast.rs
@@ -16,7 +16,6 @@ use opt_vec::OptVec;
 
 use core::cast;
 use core::option::{None, Option, Some};
-use core::task;
 use core::to_bytes;
 use core::to_str::ToStr;
 use std::serialize::{Encodable, Decodable, Encoder, Decoder};