Remove the remaining `super::\*`s.

src/bk/lv.rs

@@ -154,14 +154,14 @@ impl<T> ops::IndexMut<Level> for Array {
 
 #[cfg(test)]
 mod test {
-    use super::*;
+    use super::{self, Level};
 
     #[test]
     fn level_generation_dist() {
         // The number of generated `None`s.
         let mut nones = 0;
         // Occurences of each level.
-        let mut occ = Array::default();
+        let mut occ = lv::Array::default();
         // Simulate tousand level generations.
         for _ in 0..1000 {
             if let Some(lv) = Level::generate() {
@@ -197,15 +197,15 @@ mod test {
 
     #[test]
     fn array_max_index() {
-        assert_eq!(Array::<&str>::default()[Level::max()], "");
-        assert_eq!(Array::<u32>::default()[Level::max()], 0);
-        assert_eq!(&mut Array::<&str>::default()[Level::max()], &mut "");
-        assert_eq!(&mut Array::<u32>::default()[Level::max()], &mut 0);
+        assert_eq!(lv::Array::<&str>::default()[Level::max()], "");
+        assert_eq!(lv::Array::<u32>::default()[Level::max()], 0);
+        assert_eq!(&mut lv::Array::<&str>::default()[Level::max()], &mut "");
+        assert_eq!(&mut lv::Array::<u32>::default()[Level::max()], &mut 0);
     }
 
     #[test]
     fn array_iter() {
-        let mut arr = Array::default();
+        let mut arr = lv::Array::default();
         for lv in Iter::all() {
             arr[lv] = lv as usize;
         }

src/random.rs

@@ -44,19 +44,19 @@ pub fn get() -> u64 {
 
 #[cfg(test)]
 mod test {
-    use super::*;
+    use super;
 
     #[test]
     fn distinct() {
-        assert!(get() != get());
-        assert!(get() != get());
-        assert!(get() != get());
-        assert!(get() != get());
-        assert!(get() != get());
-        assert!(get() != get());
-        assert!(get() != get());
-        assert!(get() != get());
-        assert!(get() != get());
-        assert!(get() != get());
+        assert_ne!(random::get(), random::get());
+        assert_ne!(random::get(), random::get());
+        assert_ne!(random::get(), random::get());
+        assert_ne!(random::get(), random::get());
+        assert_ne!(random::get(), random::get());
+        assert_ne!(random::get(), random::get());
+        assert_ne!(random::get(), random::get());
+        assert_ne!(random::get(), random::get());
+        assert_ne!(random::get(), random::get());
+        assert_ne!(random::get(), random::get());
     }
 }

src/sync.rs

@@ -98,7 +98,7 @@ unsafe impl<T> Sync for Mutex<T> where T: Send {}
 
 #[cfg(test)]
 mod test {
-    use super::*;
+    use super::Mutex;
 
     #[test]
     fn mutex() {

src/take.rs

@@ -47,14 +47,14 @@ pub fn replace_with<T, F>(val: &mut T, replace: F)
 
 #[cfg(test)]
 mod test {
-    use super::*;
+    use super;
 
     use core::cell::Cell;
 
     #[test]
     fn replace_with() {
         let mut x = Some("test");
-        replace_with(&mut x, |_| None);
+        take::replace_with(&mut x, |_| None);
         assert!(x.is_none());
     }
 
@@ -62,7 +62,7 @@ mod test {
     fn replace_with_2() {
         let is_called = Cell::new(false);
         let mut x = 2;
-        replace_with(&mut x, |_| {
+        take::replace_with(&mut x, |_| {
             is_called.set(true);
             3
         });

src/tls.rs

@@ -84,8 +84,6 @@ macro_rules! tls {
 
 #[cfg(test)]
 mod test {
-    use super::*;
-
     use cell::MoveCell;
 
     #[test]