squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Minor rename

Browse source
This commit is contained in:
Aleksey Kladov 2019-12-22 15:04:31 +01:00
parent 9f616ed65a
commit fe38fffaa9
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
crates/ra_hir_def/src/item_scope.rs
View file

@ -9,7 +9,7 @@ use crate::{per_ns::PerNs, BuiltinType, ImplId, MacroDefId, ModuleDefId, TraitId
#[derive(Debug, Default, PartialEq, Eq)] #[derive(Debug, Default, PartialEq, Eq)]
pub struct ItemScope { pub struct ItemScope {
items: FxHashMap<Name, Resolution>, visible: FxHashMap<Name, Resolution>,
impls: Vec<ImplId>, impls: Vec<ImplId>,
/// Macros visible in current module in legacy textual scope /// Macros visible in current module in legacy textual scope
/// ///
@ -49,7 +49,7 @@ pub(crate) enum BuiltinShadowMode {
impl ItemScope { impl ItemScope {
pub fn entries<'a>(&'a self) -> impl Iterator<Item = (&'a Name, &'a Resolution)> + 'a { pub fn entries<'a>(&'a self) -> impl Iterator<Item = (&'a Name, &'a Resolution)> + 'a {
//FIXME: shadowing //FIXME: shadowing
self.items.iter().chain(BUILTIN_SCOPE.iter()) self.visible.iter().chain(BUILTIN_SCOPE.iter())
} }
pub fn declarations(&self) -> impl Iterator<Item = ModuleDefId> + '_ { pub fn declarations(&self) -> impl Iterator<Item = ModuleDefId> + '_ {
@ -66,7 +66,7 @@ impl ItemScope {
/// Iterate over all module scoped macros /// Iterate over all module scoped macros
pub(crate) fn macros<'a>(&'a self) -> impl Iterator<Item = (&'a Name, MacroDefId)> + 'a { pub(crate) fn macros<'a>(&'a self) -> impl Iterator<Item = (&'a Name, MacroDefId)> + 'a {
self.items self.visible
.iter() .iter()
.filter_map(|(name, res)| res.def.take_macros().map(|macro_| (name, macro_))) .filter_map(|(name, res)| res.def.take_macros().map(|macro_| (name, macro_)))
} }
@ -79,9 +79,9 @@ impl ItemScope {
/// Get a name from current module scope, legacy macros are not included /// Get a name from current module scope, legacy macros are not included
pub(crate) fn get(&self, name: &Name, shadow: BuiltinShadowMode) -> Option<&Resolution> { pub(crate) fn get(&self, name: &Name, shadow: BuiltinShadowMode) -> Option<&Resolution> {
match shadow { match shadow {
BuiltinShadowMode::Module => self.items.get(name).or_else(|| BUILTIN_SCOPE.get(name)), BuiltinShadowMode::Module => self.visible.get(name).or_else(|| BUILTIN_SCOPE.get(name)),
BuiltinShadowMode::Other => { BuiltinShadowMode::Other => {
let item = self.items.get(name); let item = self.visible.get(name);
if let Some(res) = item { if let Some(res) = item {
if let Some(ModuleDefId::ModuleId(_)) = res.def.take_types() { if let Some(ModuleDefId::ModuleId(_)) = res.def.take_types() {
return BUILTIN_SCOPE.get(name).or(item); return BUILTIN_SCOPE.get(name).or(item);
@ -94,7 +94,7 @@ impl ItemScope {
} }
pub(crate) fn traits<'a>(&'a self) -> impl Iterator<Item = TraitId> + 'a { pub(crate) fn traits<'a>(&'a self) -> impl Iterator<Item = TraitId> + 'a {
self.items.values().filter_map(|r| match r.def.take_types() { self.visible.values().filter_map(|r| match r.def.take_types() {
Some(ModuleDefId::TraitId(t)) => Some(t), Some(ModuleDefId::TraitId(t)) => Some(t),
_ => None, _ => None,
}) })
@ -114,7 +114,7 @@ impl ItemScope {
pub(crate) fn push_res(&mut self, name: Name, res: &Resolution, import: bool) -> bool { pub(crate) fn push_res(&mut self, name: Name, res: &Resolution, import: bool) -> bool {
let mut changed = false; let mut changed = false;
let existing = self.items.entry(name.clone()).or_default(); let existing = self.visible.entry(name.clone()).or_default();
if existing.def.types.is_none() && res.def.types.is_some() { if existing.def.types.is_none() && res.def.types.is_some() {
existing.def.types = res.def.types; existing.def.types = res.def.types;
@ -139,7 +139,7 @@ impl ItemScope {
} }
pub(crate) fn collect_resolutions(&self) -> Vec<(Name, Resolution)> { pub(crate) fn collect_resolutions(&self) -> Vec<(Name, Resolution)> {
self.items.iter().map(|(name, res)| (name.clone(), res.clone())).collect() self.visible.iter().map(|(name, res)| (name.clone(), res.clone())).collect()
} }
pub(crate) fn collect_legacy_macros(&self) -> FxHashMap<Name, MacroDefId> { pub(crate) fn collect_legacy_macros(&self) -> FxHashMap<Name, MacroDefId> {