Fix remaining cases of leaking imports

7 files changed, 17 insertions, 5 deletions

diff --git a/src/libstd/num/int_macros.rs b/src/libstd/num/int_macros.rs
index a08faf66199..0e7e4277dd6 100644
--- a/src/libstd/num/int_macros.rs
+++ b/src/libstd/num/int_macros.rs
@@ -445,6 +445,7 @@ mod tests {
     use int;
     use i32;
     use num;
+    use num::CheckedDiv;
     use mem;
 
     #[test]
diff --git a/src/libstd/num/uint_macros.rs b/src/libstd/num/uint_macros.rs
index 6da3e43a5d6..1a256981d74 100644
--- a/src/libstd/num/uint_macros.rs
+++ b/src/libstd/num/uint_macros.rs
@@ -324,6 +324,7 @@ mod tests {
     use super::*;
 
     use num;
+    use num::CheckedDiv;
     use mem;
     use u16;
 
diff --git a/src/libstd/os.rs b/src/libstd/os.rs
index 8f2f2190885..def8d8bb08e 100644
--- a/src/libstd/os.rs
+++ b/src/libstd/os.rs
@@ -81,13 +81,15 @@ pub fn getcwd() -> Path {
 
 #[cfg(windows)]
 pub mod win32 {
+    use libc::types::os::arch::extra::DWORD;
     use libc;
-    use vec;
-    use str;
     use option::{None, Option};
     use option;
     use os::TMPBUF_SZ;
-    use libc::types::os::arch::extra::DWORD;
+    use str::StrSlice;
+    use str;
+    use vec::{MutableVector, ImmutableVector, OwnedVector};
+    use vec;
 
     pub fn fill_utf16_buf_and_decode(f: |*mut u16, DWORD| -> DWORD)
         -> Option<~str> {
diff --git a/src/libstd/rand/os.rs b/src/libstd/rand/os.rs
index 1eaff3f51a6..a8fd75c1bee 100644
--- a/src/libstd/rand/os.rs
+++ b/src/libstd/rand/os.rs
@@ -106,6 +106,9 @@ impl Rng for OSRng {
         unsafe { cast::transmute(v) }
     }
     fn fill_bytes(&mut self, v: &mut [u8]) {
+        use container::Container;
+        use vec::MutableVector;
+
         extern {
             fn rust_win32_rand_gen(hProv: HCRYPTPROV, dwLen: DWORD,
                                    pbBuffer: *mut BYTE);
diff --git a/src/libstd/rt/args.rs b/src/libstd/rt/args.rs
index a767af4cc0e..057e3f0b359 100644
--- a/src/libstd/rt/args.rs
+++ b/src/libstd/rt/args.rs
@@ -64,8 +64,10 @@ pub unsafe fn init(argc: int, argv: **u8) { realargs::init(argc, argv) }
 #[cfg(target_os = "freebsd")]
 mod imp {
     use cast;
+    use clone::Clone;
     #[cfg(not(test))] use libc;
     use option::{Option, Some, None};
+    use ptr::RawPtr;
     use iter::Iterator;
     #[cfg(not(test))] use str;
     use unstable::finally::Finally;
diff --git a/src/libstd/unstable/dynamic_lib.rs b/src/libstd/unstable/dynamic_lib.rs
index 0569fe32c58..24568fe13e5 100644
--- a/src/libstd/unstable/dynamic_lib.rs
+++ b/src/libstd/unstable/dynamic_lib.rs
@@ -199,11 +199,12 @@ pub mod dl {
 
 #[cfg(target_os = "win32")]
 pub mod dl {
-    use os;
     use libc;
+    use os;
+    use path::GenericPath;
     use path;
     use ptr;
-    use result::*;
+    use result::{Ok, Err, Result};
 
     pub unsafe fn open_external(filename: &path::Path) -> *libc::c_void {
         os::win32::as_utf16_p(filename.as_str().unwrap(), |raw_name| {
diff --git a/src/libstd/unstable/mutex.rs b/src/libstd/unstable/mutex.rs
index 3f03486d426..4d12435e01a 100644
--- a/src/libstd/unstable/mutex.rs
+++ b/src/libstd/unstable/mutex.rs
@@ -249,6 +249,8 @@ mod imp {
     use libc;
     use libc::{HANDLE, BOOL, LPSECURITY_ATTRIBUTES, c_void, DWORD, LPCSTR};
     use ptr;
+    use ptr::RawPtr;
+
     type LPCRITICAL_SECTION = *c_void;
     static SPIN_COUNT: DWORD = 4000;