13 files changed, 11 insertions, 30 deletions
diff --git a/src/libstd/fmt/parse.rs b/src/libstd/fmt/parse.rs
index 6448896a489..4bfa6b5afce 100644
--- a/src/libstd/fmt/parse.rs
+++ b/src/libstd/fmt/parse.rs
@@ -595,7 +595,6 @@ impl<'self> Parser<'self> {
 mod tests {
     use super::*;
     use prelude::*;
-    use realstd::fmt::{String};
 
     fn same(fmt: &'static str, p: ~[Piece<'static>]) {
         let mut parser = Parser::new(fmt);
diff --git a/src/libstd/ptr.rs b/src/libstd/ptr.rs
index 02469527b7a..38d8a244895 100644
--- a/src/libstd/ptr.rs
+++ b/src/libstd/ptr.rs
@@ -12,6 +12,7 @@
 
 use cast;
 use clone::Clone;
+#[cfg(not(test))]
 use cmp::Equiv;
 use iterator::{range, Iterator};
 use option::{Option, Some, None};
diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs
index 81113f24329..61dcc6c1947 100644
--- a/src/libsyntax/parse/mod.rs
+++ b/src/libsyntax/parse/mod.rs
@@ -340,7 +340,7 @@ mod test {
     use parse::token::{str_to_ident};
     use util::parser_testing::{string_to_tts_and_sess, string_to_parser};
     use util::parser_testing::{string_to_expr, string_to_item};
-    use util::parser_testing::{string_to_stmt, strs_to_idents};
+    use util::parser_testing::string_to_stmt;
 
     // map a string to tts, return the tt without its parsesess
     fn string_to_tts_only(source_str : @str) -> ~[ast::token_tree] {
diff --git a/src/test/bench/shootout-pfib.rs b/src/test/bench/shootout-pfib.rs
index b2491e305b2..7029ca2a492 100644
--- a/src/test/bench/shootout-pfib.rs
+++ b/src/test/bench/shootout-pfib.rs
@@ -28,7 +28,6 @@ use std::io;
 use std::os;
 use std::result::{Ok, Err};
 use std::task;
-use std::u64;
 use std::uint;
 
 fn fib(n: int) -> int {
diff --git a/src/test/run-pass/const-cross-crate-extern.rs b/src/test/run-pass/const-cross-crate-extern.rs
index eb7ae3d6fec..5ded736ab9b 100644
--- a/src/test/run-pass/const-cross-crate-extern.rs
+++ b/src/test/run-pass/const-cross-crate-extern.rs
@@ -13,11 +13,8 @@
 
 extern mod cci_const;
 use cci_const::bar;
-use std::cast::transmute;
 static foo: extern "C" fn() = bar;
 
 pub fn main() {
-    unsafe {
-        assert_eq!(foo, bar);
-    }
+    assert_eq!(foo, bar);
 }
diff --git a/src/test/run-pass/const-extern-function.rs b/src/test/run-pass/const-extern-function.rs
index e07af4b0383..501a87955da 100644
--- a/src/test/run-pass/const-extern-function.rs
+++ b/src/test/run-pass/const-extern-function.rs
@@ -18,8 +18,6 @@ struct S {
 }
 
 pub fn main() {
-    unsafe {
-        assert_eq!(foopy, f);
-        assert_eq!(f, s.f);
-    }
+    assert_eq!(foopy, f);
+    assert_eq!(f, s.f);
 }
diff --git a/src/test/run-pass/extern-compare-with-return-type.rs b/src/test/run-pass/extern-compare-with-return-type.rs
index 41bf4a10b5d..5406fa283e7 100644
--- a/src/test/run-pass/extern-compare-with-return-type.rs
+++ b/src/test/run-pass/extern-compare-with-return-type.rs
@@ -15,7 +15,7 @@ extern fn voidret2() {}
 
 extern fn uintret() -> uint { 22 }
 
-extern fn uintvoidret(x: uint) {}
+extern fn uintvoidret(_x: uint) {}
 
 extern fn uintuintuintuintret(x: uint, y: uint, z: uint) -> uint { x+y+z }
 
diff --git a/src/test/run-pass/extern-take-value.rs b/src/test/run-pass/extern-take-value.rs
index e636f511da8..b883fbd6f6a 100644
--- a/src/test/run-pass/extern-take-value.rs
+++ b/src/test/run-pass/extern-take-value.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::cast::transmute;
-
 extern fn f() {
 }
 
@@ -17,12 +15,10 @@ extern fn g() {
 }
 
 pub fn main() {
-    unsafe {
-        let a: extern "C" fn() = f;
-        let b: extern "C" fn() = f;
-        let c: extern "C" fn() = g;
+    let a: extern "C" fn() = f;
+    let b: extern "C" fn() = f;
+    let c: extern "C" fn() = g;
 
-        assert_eq!(a, b);
-        assert!(a != c);
-    }
+    assert_eq!(a, b);
+    assert!(a != c);
 }
diff --git a/src/test/run-pass/issue-5917.rs b/src/test/run-pass/issue-5917.rs
index 3e588bb53d2..326e92d3b70 100644
--- a/src/test/run-pass/issue-5917.rs
+++ b/src/test/run-pass/issue-5917.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::io;
-
 struct T (&'static [int]);
 static t : T = T (&'static [5, 4, 3]);
 fn main () {
diff --git a/src/test/run-pass/monad.rs b/src/test/run-pass/monad.rs
index 7dc859e559e..8baf15c8493 100644
--- a/src/test/run-pass/monad.rs
+++ b/src/test/run-pass/monad.rs
@@ -10,8 +10,6 @@
 
 // xfail-fast
 
-use std::int;
-
 trait vec_monad<A> {
     fn bind<B>(&self, f: &fn(&A) -> ~[B]) -> ~[B];
 }
diff --git a/src/test/run-pass/reflect-visit-data.rs b/src/test/run-pass/reflect-visit-data.rs
index efa3286e94a..1c77a6b2fb9 100644
--- a/src/test/run-pass/reflect-visit-data.rs
+++ b/src/test/run-pass/reflect-visit-data.rs
@@ -10,7 +10,6 @@
 
 // xfail-fast
 
-use std::int;
 use std::libc::c_void;
 use std::ptr;
 use std::sys;
diff --git a/src/test/run-pass/static-impl.rs b/src/test/run-pass/static-impl.rs
index 520b3583195..651b3342d58 100644
--- a/src/test/run-pass/static-impl.rs
+++ b/src/test/run-pass/static-impl.rs
@@ -10,8 +10,6 @@
 
 // xfail-fast
 
-use std::uint;
-
 pub trait plus {
     fn plus(&self) -> int;
 }
diff --git a/src/test/run-pass/trait-generic.rs b/src/test/run-pass/trait-generic.rs
index 6916db28e11..f448bcb4ab5 100644
--- a/src/test/run-pass/trait-generic.rs
+++ b/src/test/run-pass/trait-generic.rs
@@ -10,8 +10,6 @@
 
 // xfail-fast
 
-use std::int;
-
 trait to_str {
     fn to_string(&self) -> ~str;
 }