From 0702e53576886505d5ba7c40fb4beb0df3ed0d9d Mon Sep 17 00:00:00 2001
From: James Miller <james@aatch.net>
Date: Thu, 20 Jun 2013 17:41:54 +1200
Subject: [PATCH] libstd: cleanup warnings

---
 src/libstd/comm.rs                 |  1 -
 src/libstd/old_iter.rs             |  2 +-
 src/libstd/os.rs                   | 10 ++++------
 src/libstd/pipes.rs                |  1 -
 src/libstd/task/spawn.rs           |  1 -
 src/libstd/unstable/dynamic_lib.rs |  1 -
 src/libstd/unstable/global.rs      |  2 +-
 src/libstd/unstable/lang.rs        | 16 ++--------------
 src/libstd/vec.rs                  |  2 +-
 9 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/src/libstd/comm.rs b/src/libstd/comm.rs
index 3f30c811e51..7918abe4ae6 100644
--- a/src/libstd/comm.rs
+++ b/src/libstd/comm.rs
@@ -20,7 +20,6 @@ use either::{Either, Left, Right};
 use kinds::Owned;
 use option::{Option, Some, None};
 use uint;
-use vec;
 use vec::OwnedVector;
 use util::replace;
 use unstable::sync::{Exclusive, exclusive};
diff --git a/src/libstd/old_iter.rs b/src/libstd/old_iter.rs
index d0e1cfd15f4..83bb9eb0908 100644
--- a/src/libstd/old_iter.rs
+++ b/src/libstd/old_iter.rs
@@ -16,7 +16,7 @@
 
 #[allow(missing_doc)];
 
-use cmp::{Eq, Ord};
+use cmp::{Eq};
 use kinds::Copy;
 use option::{None, Option, Some};
 use vec;
diff --git a/src/libstd/os.rs b/src/libstd/os.rs
index e48dc723c47..59b40b93d4d 100644
--- a/src/libstd/os.rs
+++ b/src/libstd/os.rs
@@ -959,12 +959,10 @@ pub fn copy_file(from: &Path, to: &Path) -> bool {
             fclose(ostream);
 
             // Give the new file the old file's permissions
-            unsafe {
-                if do str::as_c_str(to.to_str()) |to_buf| {
-                    libc::chmod(to_buf, from_mode as mode_t)
-                } != 0 {
-                    return false; // should be a condition...
-                }
+            if do str::as_c_str(to.to_str()) |to_buf| {
+                libc::chmod(to_buf, from_mode as mode_t)
+            } != 0 {
+                return false; // should be a condition...
             }
             return ok;
         }
diff --git a/src/libstd/pipes.rs b/src/libstd/pipes.rs
index 3448401e0b1..26dd4af45d6 100644
--- a/src/libstd/pipes.rs
+++ b/src/libstd/pipes.rs
@@ -86,7 +86,6 @@ bounded and unbounded protocols allows for less code duplication.
 
 use container::Container;
 use cast::{forget, transmute, transmute_copy, transmute_mut};
-use cast;
 use either::{Either, Left, Right};
 use iterator::IteratorUtil;
 use kinds::Owned;
diff --git a/src/libstd/task/spawn.rs b/src/libstd/task/spawn.rs
index 16bb2fab7ba..77053f39677 100644
--- a/src/libstd/task/spawn.rs
+++ b/src/libstd/task/spawn.rs
@@ -79,7 +79,6 @@ use cast;
 use cell::Cell;
 use container::Map;
 use comm::{Chan, GenericChan};
-use ptr;
 use hashmap::HashSet;
 use task::local_data_priv::{local_get, local_set, OldHandle};
 use task::rt::rust_task;
diff --git a/src/libstd/unstable/dynamic_lib.rs b/src/libstd/unstable/dynamic_lib.rs
index f5f88f2bb88..64dd5bba6bc 100644
--- a/src/libstd/unstable/dynamic_lib.rs
+++ b/src/libstd/unstable/dynamic_lib.rs
@@ -15,7 +15,6 @@ Dynamic library facilities.
 A simple wrapper over the platforms dynamic library facilities
 
 */
-use ptr;
 use cast;
 use path;
 use libc;
diff --git a/src/libstd/unstable/global.rs b/src/libstd/unstable/global.rs
index 96549a83a8c..f81252274c4 100644
--- a/src/libstd/unstable/global.rs
+++ b/src/libstd/unstable/global.rs
@@ -105,7 +105,7 @@ unsafe fn global_data_modify_<T:Owned>(
                 let dtor: ~fn() = match maybe_dtor {
                     Some(dtor) => dtor,
                     None => {
-                        let dtor: ~fn() = || unsafe {
+                        let dtor: ~fn() = || {
                             let _destroy_value: ~T = transmute(data);
                         };
                         dtor
diff --git a/src/libstd/unstable/lang.rs b/src/libstd/unstable/lang.rs
index 505cfa2fcd9..d37579b0c47 100644
--- a/src/libstd/unstable/lang.rs
+++ b/src/libstd/unstable/lang.rs
@@ -387,9 +387,6 @@ pub unsafe fn strdup_uniq(ptr: *c_uchar, len: uint) -> ~str {
 pub fn start(main: *u8, argc: int, argv: **c_char,
              crate_map: *u8) -> int {
     use rt;
-    use sys::Closure;
-    use ptr;
-    use cast;
     use os;
 
     unsafe {
@@ -399,17 +396,8 @@ pub fn start(main: *u8, argc: int, argv: **c_char,
                               crate_map as *c_void) as int;
         } else {
             return do rt::start(argc, argv as **u8, crate_map) {
-                unsafe {
-                    // `main` is an `fn() -> ()` that doesn't take an environment
-                    // XXX: Could also call this as an `extern "Rust" fn` once they work
-                    let main = Closure {
-                        code: main as *(),
-                        env: ptr::null(),
-                    };
-                    let mainfn: &fn() = cast::transmute(main);
-
-                    mainfn();
-                }
+                let main: extern "Rust" fn() = transmute(main);
+                main();
             };
         }
     }
diff --git a/src/libstd/vec.rs b/src/libstd/vec.rs
index 0af69815cf2..7f683d0070f 100644
--- a/src/libstd/vec.rs
+++ b/src/libstd/vec.rs
@@ -19,7 +19,7 @@ use cmp::{Eq, Ord, TotalEq, TotalOrd, Ordering, Less, Equal, Greater};
 use clone::Clone;
 use old_iter::BaseIter;
 use old_iter;
-use iterator::{Iterator, IteratorUtil};
+use iterator::{Iterator};
 use iter::FromIter;
 use kinds::Copy;
 use libc;