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/src/lib.rs                       |  2 +-
 crates/ra_hir_expand/src/name.rs               | 13 +++++++------
 crates/ra_ide/src/completion/complete_scope.rs | 26 +++++++++++---------------
 3 files changed, 19 insertions(+), 22 deletions(-)

(limited to 'crates')

diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs
index 64b55860d..ea06a4a58 100644
--- a/crates/ra_hir/src/lib.rs
+++ b/crates/ra_hir/src/lib.rs
@@ -59,7 +59,7 @@ pub use hir_def::{
     ModuleDefId, // FIXME this is exposed and should be used for implementing the `TestImportsLocator` in `ra_assists` only, should be removed later along with the trait and the implementation.
 };
 pub use hir_expand::{
-    name::{known, Name},
+    name::{name, Name},
     HirFileId, InFile, MacroCallId, MacroCallLoc, MacroDefId, MacroFile, Origin,
 };
 pub use hir_ty::{display::HirDisplay, CallableDef};
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
diff --git a/crates/ra_ide/src/completion/complete_scope.rs b/crates/ra_ide/src/completion/complete_scope.rs
index fe0795984..64b04ec2b 100644
--- a/crates/ra_ide/src/completion/complete_scope.rs
+++ b/crates/ra_ide/src/completion/complete_scope.rs
@@ -72,62 +72,58 @@ pub(crate) struct ImportResolver {
 
 impl ImportResolver {
     pub(crate) fn new() -> Self {
+        use hir::name;
+
         let dummy_names = vec![
             (
                 SmolStr::new("fmt"),
-                ModPath { kind: PathKind::Plain, segments: vec![hir::known::std, hir::known::fmt] },
+                ModPath { kind: PathKind::Plain, segments: vec![name![std], name![fmt]] },
             ),
             (
                 SmolStr::new("io"),
-                ModPath { kind: PathKind::Plain, segments: vec![hir::known::std, hir::known::io] },
+                ModPath { kind: PathKind::Plain, segments: vec![name![std], name![io]] },
             ),
             (
                 SmolStr::new("iter"),
-                ModPath {
-                    kind: PathKind::Plain,
-                    segments: vec![hir::known::std, hir::known::iter],
-                },
+                ModPath { kind: PathKind::Plain, segments: vec![name![std], name![iter]] },
             ),
             (
                 SmolStr::new("hash"),
-                ModPath {
-                    kind: PathKind::Plain,
-                    segments: vec![hir::known::std, hir::known::hash],
-                },
+                ModPath { kind: PathKind::Plain, segments: vec![name![std], name![hash]] },
             ),
             (
                 SmolStr::new("Debug"),
                 ModPath {
                     kind: PathKind::Plain,
-                    segments: vec![hir::known::std, hir::known::fmt, hir::known::Debug],
+                    segments: vec![name![std], name![fmt], name![Debug]],
                 },
             ),
             (
                 SmolStr::new("Display"),
                 ModPath {
                     kind: PathKind::Plain,
-                    segments: vec![hir::known::std, hir::known::fmt, hir::known::Display],
+                    segments: vec![name![std], name![fmt], name![Display]],
                 },
             ),
             (
                 SmolStr::new("Hash"),
                 ModPath {
                     kind: PathKind::Plain,
-                    segments: vec![hir::known::std, hir::known::hash, hir::known::Hash],
+                    segments: vec![name![std], name![hash], name![Hash]],
                 },
             ),
             (
                 SmolStr::new("Hasher"),
                 ModPath {
                     kind: PathKind::Plain,
-                    segments: vec![hir::known::std, hir::known::hash, hir::known::Hasher],
+                    segments: vec![name![std], name![hash], name![Hasher]],
                 },
             ),
             (
                 SmolStr::new("Iterator"),
                 ModPath {
                     kind: PathKind::Plain,
-                    segments: vec![hir::known::std, hir::known::iter, hir::known::Iterator],
+                    segments: vec![name![std], name![iter], name![Iterator]],
                 },
             ),
         ];
-- 
cgit v1.2.3