From af42cb5981a1f94116b1da8cfeedb6efdd5aeb01 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Fri, 20 Dec 2019 16:55:38 +0100
Subject: [PATCH] Privitize impls

---
 crates/ra_hir_def/src/child_by_source.rs   | 6 +++---
 crates/ra_hir_def/src/item_scope.rs        | 6 +++++-
 crates/ra_hir_def/src/lang_item.rs         | 2 +-
 crates/ra_hir_def/src/nameres/collector.rs | 4 +++-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/crates/ra_hir_def/src/child_by_source.rs b/crates/ra_hir_def/src/child_by_source.rs
index 403ba8b5787..4488e85020e 100644
--- a/crates/ra_hir_def/src/child_by_source.rs
+++ b/crates/ra_hir_def/src/child_by_source.rs
@@ -80,9 +80,9 @@ fn child_by_source(&self, db: &impl DefDatabase) -> DynMap {
 
         module_data.scope.declarations().for_each(|item| add_module_def(db, &mut res, item));
 
-        for &impl_ in module_data.scope.impls.iter() {
-            let src = impl_.lookup(db).source(db);
-            res[keys::IMPL].insert(src, impl_)
+        for imp in module_data.scope.impls() {
+            let src = imp.lookup(db).source(db);
+            res[keys::IMPL].insert(src, imp)
         }
 
         res
diff --git a/crates/ra_hir_def/src/item_scope.rs b/crates/ra_hir_def/src/item_scope.rs
index ac56986cd49..f51e97ef9d8 100644
--- a/crates/ra_hir_def/src/item_scope.rs
+++ b/crates/ra_hir_def/src/item_scope.rs
@@ -10,7 +10,7 @@
 #[derive(Debug, Default, PartialEq, Eq)]
 pub struct ItemScope {
     items: FxHashMap<Name, Resolution>,
-    pub(crate) impls: Vec<ImplId>,
+    impls: Vec<ImplId>,
     /// Macros visible in current module in legacy textual scope
     ///
     /// For macros invoked by an unqualified identifier like `bar!()`, `legacy_macros` will be searched in first.
@@ -104,6 +104,10 @@ pub(crate) fn get_legacy_macro(&self, name: &Name) -> Option<MacroDefId> {
         self.legacy_macros.get(name).copied()
     }
 
+    pub(crate) fn define_impl(&mut self, imp: ImplId) {
+        self.impls.push(imp)
+    }
+
     pub(crate) fn push_res(
         &mut self,
         name: Name,
diff --git a/crates/ra_hir_def/src/lang_item.rs b/crates/ra_hir_def/src/lang_item.rs
index 61b2488158b..cef061837b6 100644
--- a/crates/ra_hir_def/src/lang_item.rs
+++ b/crates/ra_hir_def/src/lang_item.rs
@@ -81,7 +81,7 @@ fn collect_lang_items(&mut self, db: &impl DefDatabase, module: ModuleId) {
         // Look for impl targets
         let def_map = db.crate_def_map(module.krate);
         let module_data = &def_map[module.local_id];
-        for &impl_block in module_data.scope.impls.iter() {
+        for impl_block in module_data.scope.impls() {
             self.collect_lang_item(db, impl_block, LangItemTarget::ImplBlockId)
         }
 
diff --git a/crates/ra_hir_def/src/nameres/collector.rs b/crates/ra_hir_def/src/nameres/collector.rs
index d62fae8a645..b064ccc9c9f 100644
--- a/crates/ra_hir_def/src/nameres/collector.rs
+++ b/crates/ra_hir_def/src/nameres/collector.rs
@@ -635,7 +635,9 @@ fn collect(&mut self, items: &[raw::RawItem]) {
                         let impl_id =
                             ImplLoc { container, ast_id: AstId::new(self.file_id, ast_id) }
                                 .intern(self.def_collector.db);
-                        self.def_collector.def_map.modules[self.module_id].scope.impls.push(impl_id)
+                        self.def_collector.def_map.modules[self.module_id]
+                            .scope
+                            .define_impl(impl_id)
                     }
                 }
             }
-- 
2.44.0