From 3bfa0a35f65b08197fe677731ac8a9a81a7710bd Mon Sep 17 00:00:00 2001
From: Mazdak Farrokhzad <twingoow@gmail.com>
Date: Sat, 2 Feb 2019 10:53:27 +0100
Subject: [PATCH] liballoc: prefer imports of borrow from libcore.

---
 src/liballoc/collections/btree/map.rs    | 3 +--
 src/liballoc/collections/btree/search.rs | 7 ++++---
 src/liballoc/collections/btree/set.rs    | 6 ++----
 src/liballoc/slice.rs                    | 3 ++-
 src/liballoc/str.rs                      | 3 ++-
 src/liballoc/string.rs                   | 2 +-
 src/liballoc/vec.rs                      | 3 +--
 7 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/liballoc/collections/btree/map.rs b/src/liballoc/collections/btree/map.rs
index f81cf6f1047..b1a5fcbe6b6 100644
--- a/src/liballoc/collections/btree/map.rs
+++ b/src/liballoc/collections/btree/map.rs
@@ -1,4 +1,5 @@
 use core::{
+    borrow::Borrow,
     cmp::Ordering,
     fmt::Debug,
     hash::{Hash, Hasher},
@@ -11,8 +12,6 @@ use core::{
     fmt, intrinsics, mem, ptr,
 };
 
-use crate::borrow::Borrow;
-
 use super::{
     node::{self, Handle, NodeRef, marker, InsertResult::*, ForceResult::*},
     search::{self, SearchResult::*},
diff --git a/src/liballoc/collections/btree/search.rs b/src/liballoc/collections/btree/search.rs
index a3b56ad17c6..23c41b4dd4c 100644
--- a/src/liballoc/collections/btree/search.rs
+++ b/src/liballoc/collections/btree/search.rs
@@ -1,6 +1,7 @@
-use core::cmp::Ordering;
-
-use crate::borrow::Borrow;
+use core::{
+    borrow::Borrow,
+    cmp::Ordering,
+};
 
 use super::node::{Handle, NodeRef, marker, ForceResult::*};
 
diff --git a/src/liballoc/collections/btree/set.rs b/src/liballoc/collections/btree/set.rs
index 298d165a91a..9231d2e67cf 100644
--- a/src/liballoc/collections/btree/set.rs
+++ b/src/liballoc/collections/btree/set.rs
@@ -2,6 +2,7 @@
 // to TreeMap
 
 use core::{
+    borrow::Borrow,
     cmp::{
         Ordering::{self, Less, Greater, Equal},
         min, max,
@@ -11,10 +12,7 @@ use core::{
     ops::{BitOr, BitAnd, BitXor, Sub, RangeBounds},
 };
 
-use crate::{
-    borrow::Borrow,
-    collections::btree_map::{self, BTreeMap, Keys},
-};
+use crate::collections::btree_map::{self, BTreeMap, Keys};
 use super::Recover;
 
 // FIXME(conventions): implement bounded iterators
diff --git a/src/liballoc/slice.rs b/src/liballoc/slice.rs
index 771d8f5d347..5e17396f6d7 100644
--- a/src/liballoc/slice.rs
+++ b/src/liballoc/slice.rs
@@ -88,6 +88,7 @@
 #![cfg_attr(test, allow(unused_imports, dead_code))]
 
 use core::{
+    borrow::{Borrow, BorrowMut},
     cmp::Ordering::{self, Less},
     mem::{self, size_of},
     ptr,
@@ -95,7 +96,7 @@ use core::{
 };
 
 use crate::{
-    borrow::{Borrow, BorrowMut, ToOwned},
+    borrow::ToOwned,
     boxed::Box,
     vec::Vec,
 };
diff --git a/src/liballoc/str.rs b/src/liballoc/str.rs
index 85437defd57..9681572d883 100644
--- a/src/liballoc/str.rs
+++ b/src/liballoc/str.rs
@@ -29,6 +29,7 @@
 #![allow(unused_imports)]
 
 use core::{
+    borrow::Borrow,
     fmt,
     str::{
         self as core_str,
@@ -41,7 +42,7 @@ use core::{
 };
 
 use crate::{
-    borrow::{Borrow, ToOwned},
+    borrow::ToOwned,
     boxed::Box,
     slice::{SliceConcatExt, SliceIndex},
     string::String,
diff --git a/src/liballoc/string.rs b/src/liballoc/string.rs
index 95f6b28a168..d74a3f004a3 100644
--- a/src/liballoc/string.rs
+++ b/src/liballoc/string.rs
@@ -64,8 +64,8 @@ use core::{
 };
 
 use crate::{
-    collections::CollectionAllocErr,
     borrow::{Cow, ToOwned},
+    collections::CollectionAllocErr,
     boxed::Box,
     str::{self, from_boxed_utf8_unchecked, FromStr, Utf8Error, Chars},
     vec::Vec,
diff --git a/src/liballoc/vec.rs b/src/liballoc/vec.rs
index 2ef1497ade7..8e097206881 100644
--- a/src/liballoc/vec.rs
+++ b/src/liballoc/vec.rs
@@ -74,9 +74,8 @@ use core::{
 };
 
 use crate::{
+    borrow::{ToOwned, Cow},
     collections::CollectionAllocErr,
-    borrow::ToOwned,
-    borrow::Cow,
     boxed::Box,
     raw_vec::RawVec,
 };