From 007032f8504be1274972e4f23afaf0bc431d92d5 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sun, 22 Dec 2019 19:31:01 +0100
Subject: Refactor

---
 crates/ra_hir_def/src/item_scope.rs              | 12 +++++++-----
 crates/ra_hir_def/src/nameres/path_resolution.rs |  9 ++++-----
 2 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'crates')

diff --git a/crates/ra_hir_def/src/item_scope.rs b/crates/ra_hir_def/src/item_scope.rs
index f1adc3b58..08d788cc9 100644
--- a/crates/ra_hir_def/src/item_scope.rs
+++ b/crates/ra_hir_def/src/item_scope.rs
@@ -70,18 +70,20 @@ impl ItemScope {
     }
 
     /// Get a name from current module scope, legacy macros are not included
-    pub(crate) fn get(&self, name: &Name, shadow: BuiltinShadowMode) -> Option<&PerNs> {
+    pub(crate) fn get(&self, name: &Name, shadow: BuiltinShadowMode) -> Option<PerNs> {
         match shadow {
-            BuiltinShadowMode::Module => self.visible.get(name).or_else(|| BUILTIN_SCOPE.get(name)),
+            BuiltinShadowMode::Module => {
+                self.visible.get(name).or_else(|| BUILTIN_SCOPE.get(name)).copied()
+            }
             BuiltinShadowMode::Other => {
-                let item = self.visible.get(name);
+                let item = self.visible.get(name).copied();
                 if let Some(def) = item {
                     if let Some(ModuleDefId::ModuleId(_)) = def.take_types() {
-                        return BUILTIN_SCOPE.get(name).or(item);
+                        return BUILTIN_SCOPE.get(name).copied().or(item);
                     }
                 }
 
-                item.or_else(|| BUILTIN_SCOPE.get(name))
+                item.or_else(|| BUILTIN_SCOPE.get(name).copied())
             }
         }
     }
diff --git a/crates/ra_hir_def/src/nameres/path_resolution.rs b/crates/ra_hir_def/src/nameres/path_resolution.rs
index 378d49455..9b85ae018 100644
--- a/crates/ra_hir_def/src/nameres/path_resolution.rs
+++ b/crates/ra_hir_def/src/nameres/path_resolution.rs
@@ -181,7 +181,7 @@ impl CrateDefMap {
 
                     // Since it is a qualified path here, it should not contains legacy macros
                     match self[module.local_id].scope.get(&segment, prefer_module(i)) {
-                        Some(def) => *def,
+                        Some(def) => def,
                         _ => {
                             log::debug!("path segment {:?} not found", segment);
                             return ResolvePathResult::empty(ReachedFixedPoint::No);
@@ -243,7 +243,7 @@ impl CrateDefMap {
         //  - std prelude
         let from_legacy_macro =
             self[module].scope.get_legacy_macro(name).map_or_else(PerNs::none, PerNs::macros);
-        let from_scope = self[module].scope.get(name, shadow).copied().unwrap_or_else(PerNs::none);
+        let from_scope = self[module].scope.get(name, shadow).unwrap_or_else(PerNs::none);
         let from_extern_prelude =
             self.extern_prelude.get(name).map_or(PerNs::none(), |&it| PerNs::types(it));
         let from_prelude = self.resolve_in_prelude(db, name, shadow);
@@ -256,8 +256,7 @@ impl CrateDefMap {
         name: &Name,
         shadow: BuiltinShadowMode,
     ) -> PerNs {
-        let from_crate_root =
-            self[self.root].scope.get(name, shadow).copied().unwrap_or_else(PerNs::none);
+        let from_crate_root = self[self.root].scope.get(name, shadow).unwrap_or_else(PerNs::none);
         let from_extern_prelude = self.resolve_name_in_extern_prelude(name);
 
         from_crate_root.or(from_extern_prelude)
@@ -278,7 +277,7 @@ impl CrateDefMap {
                 keep = db.crate_def_map(prelude.krate);
                 &keep
             };
-            def_map[prelude.local_id].scope.get(name, shadow).copied().unwrap_or_else(PerNs::none)
+            def_map[prelude.local_id].scope.get(name, shadow).unwrap_or_else(PerNs::none)
         } else {
             PerNs::none()
         }
-- 
cgit v1.2.3