liballoc: revert nested imports style changes.

11 files changed, 53 insertions, 78 deletions

diff --git a/src/liballoc/tests/arc.rs b/src/liballoc/tests/arc.rs
index b71cf3bd477..2759b1b1cac 100644
--- a/src/liballoc/tests/arc.rs
+++ b/src/liballoc/tests/arc.rs
@@ -1,9 +1,7 @@
-use std::{
-    any::Any,
-    sync::{Arc, Weak},
-    cell::RefCell,
-    cmp::PartialEq,
-};
+use std::any::Any;
+use std::sync::{Arc, Weak};
+use std::cell::RefCell;
+use std::cmp::PartialEq;
 
 #[test]
 fn uninhabited() {
diff --git a/src/liballoc/tests/binary_heap.rs b/src/liballoc/tests/binary_heap.rs
index f19d641fe83..94ae43237d1 100644
--- a/src/liballoc/tests/binary_heap.rs
+++ b/src/liballoc/tests/binary_heap.rs
@@ -1,9 +1,8 @@
-use std::{
-    cmp,
-    collections::{BinaryHeap, binary_heap::{Drain, PeekMut}},
-    panic::{self, AssertUnwindSafe},
-    sync::atomic::{AtomicUsize, Ordering},
-};
+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 rand::{thread_rng, seq::SliceRandom};
 
diff --git a/src/liballoc/tests/btree/map.rs b/src/liballoc/tests/btree/map.rs
index 6859b0138b5..aaf50407328 100644
--- a/src/liballoc/tests/btree/map.rs
+++ b/src/liballoc/tests/btree/map.rs
@@ -1,9 +1,8 @@
-use std::{
-    collections::{BTreeMap, btree_map::Entry::{Occupied, Vacant}},
-    ops::Bound::{self, Excluded, Included, Unbounded},
-    rc::Rc,
-    iter::FromIterator,
-};
+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::iter::FromIterator;
 
 use super::DeterministicRng;
 
diff --git a/src/liballoc/tests/btree/set.rs b/src/liballoc/tests/btree/set.rs
index b90ecd9e3f1..4f5168f1ce5 100644
--- a/src/liballoc/tests/btree/set.rs
+++ b/src/liballoc/tests/btree/set.rs
@@ -1,7 +1,6 @@
-use std::{
-    collections::BTreeSet,
-    iter::FromIterator
-};
+use std::collections::BTreeSet;
+use std::iter::FromIterator;
+
 use super::DeterministicRng;
 
 #[test]
diff --git a/src/liballoc/tests/lib.rs b/src/liballoc/tests/lib.rs
index 100b3986370..a76fd87a1a9 100644
--- a/src/liballoc/tests/lib.rs
+++ b/src/liballoc/tests/lib.rs
@@ -13,10 +13,8 @@
 extern crate core;
 extern crate rand;
 
-use std::{
-    hash::{Hash, Hasher},
-    collections::hash_map::DefaultHasher,
-};
+use std::hash::{Hash, Hasher};
+use std::collections::hash_map::DefaultHasher;
 
 mod arc;
 mod binary_heap;
diff --git a/src/liballoc/tests/rc.rs b/src/liballoc/tests/rc.rs
index caa3c914fc2..18f82e80410 100644
--- a/src/liballoc/tests/rc.rs
+++ b/src/liballoc/tests/rc.rs
@@ -1,9 +1,7 @@
-use std::{
-    any::Any,
-    rc::{Rc, Weak},
-    cell::RefCell,
-    cmp::PartialEq,
-};
+use std::any::Any;
+use std::rc::{Rc, Weak};
+use std::cell::RefCell;
+use std::cmp::PartialEq;
 
 #[test]
 fn uninhabited() {
diff --git a/src/liballoc/tests/slice.rs b/src/liballoc/tests/slice.rs
index d0a8b65ae8b..334466dfb25 100644
--- a/src/liballoc/tests/slice.rs
+++ b/src/liballoc/tests/slice.rs
@@ -1,18 +1,14 @@
-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,
-};
+use std::cell::Cell;
+use std::cmp::Ordering::{self, Equal, Greater, Less};
+use std::mem;
+use std::panic;
+use std::rc::Rc;
+use std::sync::atomic::{Ordering::Relaxed, AtomicUsize};
+use std::thread;
+
+use rand::{Rng, RngCore, thread_rng};
+use rand::seq::SliceRandom;
+use rand::distributions::Standard;
 
 fn square(n: usize) -> usize {
     n * n
diff --git a/src/liballoc/tests/str.rs b/src/liballoc/tests/str.rs
index b1586558713..1bc1bd8d78c 100644
--- a/src/liballoc/tests/str.rs
+++ b/src/liballoc/tests/str.rs
@@ -1,8 +1,6 @@
-use std::{
-    borrow::Cow,
-    cmp::Ordering::{Equal, Greater, Less},
-    str::from_utf8,
-};
+use std::borrow::Cow;
+use std::cmp::Ordering::{Equal, Greater, Less};
+use std::str::from_utf8;
 
 #[test]
 fn test_le() {
@@ -1601,10 +1599,8 @@ fn test_repeat() {
 }
 
 mod pattern {
-    use std::str::pattern::{
-        Pattern, Searcher, ReverseSearcher,
-        SearchStep::{self, Match, Reject, Done},
-    };
+    use std::str::pattern::{Pattern, Searcher, ReverseSearcher};
+    use std::str::pattern::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 14f70fdf303..e5ce51a36ee 100644
--- a/src/liballoc/tests/string.rs
+++ b/src/liballoc/tests/string.rs
@@ -1,9 +1,7 @@
-use std::{
-    borrow::Cow,
-    collections::CollectionAllocErr::*,
-    mem::size_of,
-    usize, isize,
-};
+use std::borrow::Cow;
+use std::collections::CollectionAllocErr::*;
+use std::mem::size_of;
+use std::{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 e8fea287e1c..89f2e0a046d 100644
--- a/src/liballoc/tests/vec.rs
+++ b/src/liballoc/tests/vec.rs
@@ -1,10 +1,8 @@
-use std::{
-    borrow::Cow,
-    mem::size_of,
-    usize, isize,
-    vec::{Drain, IntoIter},
-    collections::CollectionAllocErr::*,
-};
+use std::borrow::Cow;
+use std::mem::size_of;
+use std::{usize, isize};
+use std::vec::{Drain, IntoIter};
+use std::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 313aa55a2b2..aa49bdb0090 100644
--- a/src/liballoc/tests/vec_deque.rs
+++ b/src/liballoc/tests/vec_deque.rs
@@ -1,12 +1,8 @@
-use std::{
-    fmt::Debug,
-    collections::{
-        VecDeque, vec_deque::Drain,
-        CollectionAllocErr::*,
-    },
-    mem::size_of,
-    usize, isize,
-};
+use std::fmt::Debug;
+use std::collections::{VecDeque, vec_deque::Drain};
+use std::collections::CollectionAllocErr::*;
+use std::mem::size_of;
+use std::{usize, isize};
 
 use crate::hash;