From 7adb53319d963d0a40906a6847124974da1d5183 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Fri, 20 Dec 2019 16:47:22 +0100
Subject: [PATCH] Make items private
---
crates/ra_hir_def/src/item_scope.rs | 76 ++++++++++++----------
crates/ra_hir_def/src/nameres/collector.rs | 12 +---
2 files changed, 42 insertions(+), 46 deletions(-)
diff --git a/crates/ra_hir_def/src/item_scope.rs b/crates/ra_hir_def/src/item_scope.rs
index f4fb768cd3a..ac56986cd49 100644
--- a/crates/ra_hir_def/src/item_scope.rs
+++ b/crates/ra_hir_def/src/item_scope.rs
@@ -9,7 +9,7 @@ use crate::{per_ns::PerNs, BuiltinType, ImplId, LocalImportId, MacroDefId, Modul
#[derive(Debug, Default, PartialEq, Eq)]
pub struct ItemScope {
- pub(crate) items: FxHashMap<Name, Resolution>,
+ items: FxHashMap<Name, Resolution>,
pub(crate) impls: Vec<ImplId>,
/// Macros visible in current module in legacy textual scope
///
@@ -47,41 +47,6 @@ pub(crate) enum BuiltinShadowMode {
/// Legacy macros can only be accessed through special methods like `get_legacy_macros`.
/// Other methods will only resolve values, types and module scoped macros only.
impl ItemScope {
- pub fn push_res(
- &mut self,
- name: Name,
- res: &Resolution,
- import: Option<LocalImportId>,
- ) -> bool {
- let mut changed = false;
- let existing = self.items.entry(name.clone()).or_default();
-
- if existing.def.types.is_none() && res.def.types.is_some() {
- existing.def.types = res.def.types;
- existing.import = import.or(res.import);
- changed = true;
- }
- if existing.def.values.is_none() && res.def.values.is_some() {
- existing.def.values = res.def.values;
- existing.import = import.or(res.import);
- changed = true;
- }
- if existing.def.macros.is_none() && res.def.macros.is_some() {
- existing.def.macros = res.def.macros;
- existing.import = import.or(res.import);
- changed = true;
- }
-
- if existing.def.is_none()
- && res.def.is_none()
- && existing.import.is_none()
- && res.import.is_some()
- {
- existing.import = res.import;
- }
- changed
- }
-
pub fn entries<'a>(&'a self) -> impl Iterator<Item = (&'a Name, &'a Resolution)> + 'a {
//FIXME: shadowing
self.items.iter().chain(BUILTIN_SCOPE.iter())
@@ -138,6 +103,45 @@ impl ItemScope {
pub(crate) fn get_legacy_macro(&self, name: &Name) -> Option<MacroDefId> {
self.legacy_macros.get(name).copied()
}
+
+ pub(crate) fn push_res(
+ &mut self,
+ name: Name,
+ res: &Resolution,
+ import: Option<LocalImportId>,
+ ) -> bool {
+ let mut changed = false;
+ let existing = self.items.entry(name.clone()).or_default();
+
+ if existing.def.types.is_none() && res.def.types.is_some() {
+ existing.def.types = res.def.types;
+ existing.import = import.or(res.import);
+ changed = true;
+ }
+ if existing.def.values.is_none() && res.def.values.is_some() {
+ existing.def.values = res.def.values;
+ existing.import = import.or(res.import);
+ changed = true;
+ }
+ if existing.def.macros.is_none() && res.def.macros.is_some() {
+ existing.def.macros = res.def.macros;
+ existing.import = import.or(res.import);
+ changed = true;
+ }
+
+ if existing.def.is_none()
+ && res.def.is_none()
+ && existing.import.is_none()
+ && res.import.is_some()
+ {
+ existing.import = res.import;
+ }
+ changed
+ }
+
+ pub(crate) fn collect_resolutions(&self) -> Vec<(Name, Resolution)> {
+ self.items.iter().map(|(name, res)| (name.clone(), res.clone())).collect()
+ }
}
#[derive(Debug, Clone, PartialEq, Eq, Default)]
diff --git a/crates/ra_hir_def/src/nameres/collector.rs b/crates/ra_hir_def/src/nameres/collector.rs
index 95c499ec9fc..d62fae8a645 100644
--- a/crates/ra_hir_def/src/nameres/collector.rs
+++ b/crates/ra_hir_def/src/nameres/collector.rs
@@ -372,11 +372,7 @@ where
let scope = &item_map[m.local_id].scope;
// Module scoped macros is included
- let items = scope
- .items
- .iter()
- .map(|(name, res)| (name.clone(), res.clone()))
- .collect::<Vec<_>>();
+ let items = scope.collect_resolutions();
self.update(module_id, Some(import_id), &items);
} else {
@@ -386,11 +382,7 @@ where
let scope = &self.def_map[m.local_id].scope;
// Module scoped macros is included
- let items = scope
- .items
- .iter()
- .map(|(name, res)| (name.clone(), res.clone()))
- .collect::<Vec<_>>();
+ let items = scope.collect_resolutions();
self.update(module_id, Some(import_id), &items);
// record the glob import in case we add further items