From 7a2e449424227c7f6cebe0581513287023297999 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <mail4score@gmail.com>
Date: Tue, 28 Jan 2020 00:09:56 +0200
Subject: Prefer imports starting with std

---
 crates/ra_hir_expand/src/name.rs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'crates/ra_hir_expand/src/name.rs')

diff --git a/crates/ra_hir_expand/src/name.rs b/crates/ra_hir_expand/src/name.rs
index b3fa1efba..b2e10f445 100644
--- a/crates/ra_hir_expand/src/name.rs
+++ b/crates/ra_hir_expand/src/name.rs
@@ -141,6 +141,8 @@ pub mod known {
         macro_rules,
         // Components of known path (value or mod name)
         std,
+        core,
+        alloc,
         iter,
         ops,
         future,
-- 
cgit v1.2.3


From 6dae5cbb1190cde6a20aa1758c7d87e84933378e Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <mail4score@gmail.com>
Date: Sun, 2 Feb 2020 14:06:51 +0200
Subject: Require ModPath for importing

---
 crates/ra_hir_expand/src/name.rs | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'crates/ra_hir_expand/src/name.rs')

diff --git a/crates/ra_hir_expand/src/name.rs b/crates/ra_hir_expand/src/name.rs
index b2e10f445..44b47ec91 100644
--- a/crates/ra_hir_expand/src/name.rs
+++ b/crates/ra_hir_expand/src/name.rs
@@ -143,6 +143,9 @@ pub mod known {
         std,
         core,
         alloc,
+        hash,
+        fmt,
+        io,
         iter,
         ops,
         future,
@@ -167,6 +170,9 @@ pub mod known {
         Neg,
         Not,
         Index,
+        Display,
+        Iterator,
+        Hasher,
         // Builtin macros
         file,
         column,
-- 
cgit v1.2.3


From c669b2f489cb551fbe53fd01f7532b5d55ffe704 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <mail4score@gmail.com>
Date: Sun, 2 Feb 2020 14:27:52 +0200
Subject: Code review fixes

---
 crates/ra_hir_expand/src/name.rs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'crates/ra_hir_expand/src/name.rs')

diff --git a/crates/ra_hir_expand/src/name.rs b/crates/ra_hir_expand/src/name.rs
index 44b47ec91..133805bdb 100644
--- a/crates/ra_hir_expand/src/name.rs
+++ b/crates/ra_hir_expand/src/name.rs
@@ -143,9 +143,6 @@ pub mod known {
         std,
         core,
         alloc,
-        hash,
-        fmt,
-        io,
         iter,
         ops,
         future,
@@ -170,9 +167,6 @@ pub mod known {
         Neg,
         Not,
         Index,
-        Display,
-        Iterator,
-        Hasher,
         // Builtin macros
         file,
         column,
@@ -193,6 +187,13 @@ pub mod known {
         PartialOrd,
         Eq,
         PartialEq,
+        // FIXME delete those after `ImportResolver` is removed.
+        hash,
+        fmt,
+        io,
+        Display,
+        Iterator,
+        Hasher,
     );
 
     // self/Self cannot be used as an identifier
-- 
cgit v1.2.3


From 7de7c8a7efa7af2e3de3a401ea31fb26cad9649b Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <mail4score@gmail.com>
Date: Sun, 9 Feb 2020 12:34:41 +0200
Subject: Remove ImportResolver-related stubs

---
 crates/ra_hir_expand/src/name.rs | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'crates/ra_hir_expand/src/name.rs')

diff --git a/crates/ra_hir_expand/src/name.rs b/crates/ra_hir_expand/src/name.rs
index 133805bdb..b2e10f445 100644
--- a/crates/ra_hir_expand/src/name.rs
+++ b/crates/ra_hir_expand/src/name.rs
@@ -187,13 +187,6 @@ pub mod known {
         PartialOrd,
         Eq,
         PartialEq,
-        // FIXME delete those after `ImportResolver` is removed.
-        hash,
-        fmt,
-        io,
-        Display,
-        Iterator,
-        Hasher,
     );
 
     // self/Self cannot be used as an identifier
-- 
cgit v1.2.3