liballoc: refactor & fix some imports.

12 files changed, 90 insertions, 62 deletions

diff --git a/src/liballoc/tests/arc.rs b/src/liballoc/tests/arc.rs
index 2759b1b1cac..b71cf3bd477 100644
--- a/src/liballoc/tests/arc.rs
+++ b/src/liballoc/tests/arc.rs
@@ -1,7 +1,9 @@
-use std::any::Any;
-use std::sync::{Arc, Weak};
-use std::cell::RefCell;
-use std::cmp::PartialEq;
+use std::{
+    any::Any,
+    sync::{Arc, Weak},
+    cell::RefCell,
+    cmp::PartialEq,
+};
 
 #[test]
 fn uninhabited() {
diff --git a/src/liballoc/tests/binary_heap.rs b/src/liballoc/tests/binary_heap.rs
index 94ae43237d1..f19d641fe83 100644
--- a/src/liballoc/tests/binary_heap.rs
+++ b/src/liballoc/tests/binary_heap.rs
@@ -1,8 +1,9 @@
-use std::cmp;
-use std::collections::BinaryHeap;
-use std::collections::binary_heap::{Drain, PeekMut};
-use std::panic::{self, AssertUnwindSafe};
-use std::sync::atomic::{AtomicUsize, Ordering};
+use std::{
+    cmp,
+    collections::{BinaryHeap, binary_heap::{Drain, PeekMut}},
+    panic::{self, AssertUnwindSafe},
+    sync::atomic::{AtomicUsize, Ordering},
+};
 
 use rand::{thread_rng, seq::SliceRandom};
 
diff --git a/src/liballoc/tests/btree/map.rs b/src/liballoc/tests/btree/map.rs
index 05e0bdffaa8..33f65980784 100644
--- a/src/liballoc/tests/btree/map.rs
+++ b/src/liballoc/tests/btree/map.rs
@@ -1,9 +1,10 @@
-use std::collections::BTreeMap;
-use std::collections::btree_map::Entry::{Occupied, Vacant};
-use std::ops::Bound::{self, Excluded, Included, Unbounded};
-use std::rc::Rc;
+use std::{
+    collections::{BTreeMap, btree_map::Entry::{Occupied, Vacant}},
+    ops::Bound::{self, Excluded, Included, Unbounded},
+    rc::Rc,
+    iter::FromIterator,
+};
 
-use std::iter::FromIterator;
 use super::DeterministicRng;
 
 #[test]
diff --git a/src/liballoc/tests/btree/set.rs b/src/liballoc/tests/btree/set.rs
index e24c04fd8ac..b90ecd9e3f1 100644
--- a/src/liballoc/tests/btree/set.rs
+++ b/src/liballoc/tests/btree/set.rs
@@ -1,6 +1,7 @@
-use std::collections::BTreeSet;
-
-use std::iter::FromIterator;
+use std::{
+    collections::BTreeSet,
+    iter::FromIterator
+};
 use super::DeterministicRng;
 
 #[test]
@@ -15,6 +16,8 @@ fn test_clone_eq() {
 
 #[test]
 fn test_hash() {
+    use crate::hash;
+
     let mut x = BTreeSet::new();
     let mut y = BTreeSet::new();
 
@@ -26,7 +29,7 @@ fn test_hash() {
     y.insert(2);
     y.insert(1);
 
-    assert!(::hash(&x) == ::hash(&y));
+    assert!(hash(&x) == hash(&y));
 }
 
 fn check<F>(a: &[i32], b: &[i32], expected: &[i32], f: F)
diff --git a/src/liballoc/tests/lib.rs b/src/liballoc/tests/lib.rs
index a76fd87a1a9..100b3986370 100644
--- a/src/liballoc/tests/lib.rs
+++ b/src/liballoc/tests/lib.rs
@@ -13,8 +13,10 @@
 extern crate core;
 extern crate rand;
 
-use std::hash::{Hash, Hasher};
-use std::collections::hash_map::DefaultHasher;
+use std::{
+    hash::{Hash, Hasher},
+    collections::hash_map::DefaultHasher,
+};
 
 mod arc;
 mod binary_heap;
diff --git a/src/liballoc/tests/linked_list.rs b/src/liballoc/tests/linked_list.rs
index 6e775f9650d..0fbfbdccd45 100644
--- a/src/liballoc/tests/linked_list.rs
+++ b/src/liballoc/tests/linked_list.rs
@@ -241,10 +241,12 @@ fn test_eq() {
 
 #[test]
 fn test_hash() {
+    use crate::hash;
+
     let mut x = LinkedList::new();
     let mut y = LinkedList::new();
 
-    assert!(::hash(&x) == ::hash(&y));
+    assert!(hash(&x) == hash(&y));
 
     x.push_back(1);
     x.push_back(2);
@@ -254,7 +256,7 @@ fn test_hash() {
     y.push_front(2);
     y.push_front(1);
 
-    assert!(::hash(&x) == ::hash(&y));
+    assert!(hash(&x) == hash(&y));
 }
 
 #[test]
diff --git a/src/liballoc/tests/rc.rs b/src/liballoc/tests/rc.rs
index 18f82e80410..caa3c914fc2 100644
--- a/src/liballoc/tests/rc.rs
+++ b/src/liballoc/tests/rc.rs
@@ -1,7 +1,9 @@
-use std::any::Any;
-use std::rc::{Rc, Weak};
-use std::cell::RefCell;
-use std::cmp::PartialEq;
+use std::{
+    any::Any,
+    rc::{Rc, Weak},
+    cell::RefCell,
+    cmp::PartialEq,
+};
 
 #[test]
 fn uninhabited() {
diff --git a/src/liballoc/tests/slice.rs b/src/liballoc/tests/slice.rs
index 0300bd7f3f6..d0a8b65ae8b 100644
--- a/src/liballoc/tests/slice.rs
+++ b/src/liballoc/tests/slice.rs
@@ -1,15 +1,18 @@
-use std::cell::Cell;
-use std::cmp::Ordering::{Equal, Greater, Less};
-use std::cmp::Ordering;
-use std::mem;
-use std::panic;
-use std::rc::Rc;
-use std::sync::atomic::Ordering::Relaxed;
-use std::sync::atomic::AtomicUsize;
-use std::thread;
-
-use rand::{Rng, RngCore, thread_rng, seq::SliceRandom};
-use rand::distributions::Standard;
+use std::{
+    cell::Cell,
+    cmp::Ordering::{self, Equal, Greater, Less},
+    mem,
+    panic,
+    rc::Rc,
+    sync::atomic::{Ordering::Relaxed, AtomicUsize},
+    thread,
+};
+
+use rand::{
+    Rng, RngCore, thread_rng,
+    seq::SliceRandom,
+    distributions::Standard,
+};
 
 fn square(n: usize) -> usize {
     n * n
@@ -476,7 +479,7 @@ fn test_sort_stability() {
             // the second item represents which occurrence of that
             // number this element is, i.e., the second elements
             // will occur in sorted order.
-            let mut orig: Vec<_> = (0..len)
+            let orig: Vec<_> = (0..len)
                 .map(|_| {
                     let n = thread_rng().gen::<usize>() % 10;
                     counts[n] += 1;
diff --git a/src/liballoc/tests/str.rs b/src/liballoc/tests/str.rs
index 66a1b947a7d..583e616bf6d 100644
--- a/src/liballoc/tests/str.rs
+++ b/src/liballoc/tests/str.rs
@@ -1,6 +1,8 @@
-use std::borrow::Cow;
-use std::cmp::Ordering::{Equal, Greater, Less};
-use std::str::from_utf8;
+use std::{
+    borrow::Cow,
+    cmp::Ordering::{Equal, Greater, Less},
+    str::from_utf8,
+};
 
 #[test]
 fn test_le() {
@@ -1599,9 +1601,10 @@ fn test_repeat() {
 }
 
 mod pattern {
-    use std::str::pattern::Pattern;
-    use std::str::pattern::{Searcher, ReverseSearcher};
-    use std::str::pattern::SearchStep::{self, Match, Reject, Done};
+    use std::str::pattern::{
+        Pattern, Searcher, ReverseSearcher,
+        SearchStep::{self, Match, Reject, Done},
+    };
 
     macro_rules! make_test {
         ($name:ident, $p:expr, $h:expr, [$($e:expr,)*]) => {
diff --git a/src/liballoc/tests/string.rs b/src/liballoc/tests/string.rs
index 8a5bfca8b7d..9e4ffb5be9d 100644
--- a/src/liballoc/tests/string.rs
+++ b/src/liballoc/tests/string.rs
@@ -1,7 +1,9 @@
-use std::borrow::Cow;
-use std::collections::CollectionAllocErr::*;
-use std::mem::size_of;
-use std::{usize, isize};
+use std::{
+    borrow::Cow,
+    collections::CollectionAllocErr::*,
+    mem::size_of,
+    usize, isize,
+};
 
 pub trait IntoCow<'a, B: ?Sized> where B: ToOwned {
     fn into_cow(self) -> Cow<'a, B>;
diff --git a/src/liballoc/tests/vec.rs b/src/liballoc/tests/vec.rs
index 0fdcf34c783..473d41d483e 100644
--- a/src/liballoc/tests/vec.rs
+++ b/src/liballoc/tests/vec.rs
@@ -1,8 +1,10 @@
-use std::borrow::Cow;
-use std::mem::size_of;
-use std::{usize, isize};
-use std::vec::{Drain, IntoIter};
-use std::collections::CollectionAllocErr::*;
+use std::{
+    borrow::Cow,
+    mem::size_of,
+    usize, isize,
+    vec::{Drain, IntoIter},
+    collections::CollectionAllocErr::*,
+};
 
 struct DropCounter<'a> {
     count: &'a mut u32,
diff --git a/src/liballoc/tests/vec_deque.rs b/src/liballoc/tests/vec_deque.rs
index c9d16a06b47..cbc9fefcdff 100644
--- a/src/liballoc/tests/vec_deque.rs
+++ b/src/liballoc/tests/vec_deque.rs
@@ -1,9 +1,14 @@
-use std::collections::VecDeque;
-use std::fmt::Debug;
-use std::collections::vec_deque::{Drain};
-use std::collections::CollectionAllocErr::*;
-use std::mem::size_of;
-use std::{usize, isize};
+use std::{
+    fmt::Debug,
+    collections::{
+        VecDeque, vec_deque::Drain,
+        CollectionAllocErr::*,
+    },
+    mem::size_of,
+    usize, isize,
+};
+
+use crate::hash;
 
 use self::Taggy::*;
 use self::Taggypar::*;
@@ -583,7 +588,7 @@ fn test_hash() {
     y.push_back(2);
     y.push_back(3);
 
-    assert!(::hash(&x) == ::hash(&y));
+    assert!(hash(&x) == hash(&y));
 }
 
 #[test]
@@ -599,7 +604,7 @@ fn test_hash_after_rotation() {
             *elt -= 1;
         }
         ring.push_back(len - 1);
-        assert_eq!(::hash(&orig), ::hash(&ring));
+        assert_eq!(hash(&orig), hash(&ring));
         assert_eq!(orig, ring);
         assert_eq!(ring, orig);
     }