liballoc: refactor & fix some imports.

1 files changed, 24 insertions, 15 deletions

diff --git a/src/liballoc/string.rs b/src/liballoc/string.rs
index d8f46374ce2..e9da10b3597 100644
--- a/src/liballoc/string.rs
+++ b/src/liballoc/string.rs
@@ -46,21 +46,30 @@
 
 #![stable(feature = "rust1", since = "1.0.0")]
 
-use core::char::{decode_utf16, REPLACEMENT_CHARACTER};
-use core::fmt;
-use core::hash;
-use core::iter::{FromIterator, FusedIterator};
-use core::ops::Bound::{Excluded, Included, Unbounded};
-use core::ops::{self, Add, AddAssign, Index, IndexMut, RangeBounds};
-use core::ptr;
-use core::str::pattern::Pattern;
-use core::str::lossy;
-
-use crate::collections::CollectionAllocErr;
-use crate::borrow::{Cow, ToOwned};
-use crate::boxed::Box;
-use crate::str::{self, from_boxed_utf8_unchecked, FromStr, Utf8Error, Chars};
-use crate::vec::Vec;
+use core::{
+    char::{decode_utf16, REPLACEMENT_CHARACTER},
+    fmt,
+    hash,
+    iter::{FromIterator, FusedIterator},
+    ops::{
+        self,
+        Bound::{Excluded, Included, Unbounded},
+        Add, AddAssign, Index, IndexMut, RangeBounds,
+    },
+    ptr,
+    str::{
+        pattern::Pattern,
+        lossy,
+    }
+};
+
+use crate::{
+    collections::CollectionAllocErr,
+    borrow::{Cow, ToOwned},
+    boxed::Box,
+    str::{self, from_boxed_utf8_unchecked, FromStr, Utf8Error, Chars},
+    vec::Vec,
+};
 
 /// A UTF-8 encoded, growable string.
 ///