From b28c54a2c239acd73f2eea80fda9ee3960d2c046 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 13 Aug 2020 16:28:27 +0200 Subject: Rename ra_hir_def -> hir_def --- crates/ra_hir_def/src/per_ns.rs | 95 ----------------------------------------- 1 file changed, 95 deletions(-) delete mode 100644 crates/ra_hir_def/src/per_ns.rs (limited to 'crates/ra_hir_def/src/per_ns.rs') diff --git a/crates/ra_hir_def/src/per_ns.rs b/crates/ra_hir_def/src/per_ns.rs deleted file mode 100644 index 74665c588..000000000 --- a/crates/ra_hir_def/src/per_ns.rs +++ /dev/null @@ -1,95 +0,0 @@ -//! In rust, it is possible to have a value, a type and a macro with the same -//! name without conflicts. -//! -//! `PerNs` (per namespace) captures this. - -use hir_expand::MacroDefId; - -use crate::{item_scope::ItemInNs, visibility::Visibility, ModuleDefId}; - -#[derive(Debug, Copy, Clone, PartialEq, Eq)] -pub struct PerNs { - pub types: Option<(ModuleDefId, Visibility)>, - pub values: Option<(ModuleDefId, Visibility)>, - pub macros: Option<(MacroDefId, Visibility)>, -} - -impl Default for PerNs { - fn default() -> Self { - PerNs { types: None, values: None, macros: None } - } -} - -impl PerNs { - pub fn none() -> PerNs { - PerNs { types: None, values: None, macros: None } - } - - pub fn values(t: ModuleDefId, v: Visibility) -> PerNs { - PerNs { types: None, values: Some((t, v)), macros: None } - } - - pub fn types(t: ModuleDefId, v: Visibility) -> PerNs { - PerNs { types: Some((t, v)), values: None, macros: None } - } - - pub fn both(types: ModuleDefId, values: ModuleDefId, v: Visibility) -> PerNs { - PerNs { types: Some((types, v)), values: Some((values, v)), macros: None } - } - - pub fn macros(macro_: MacroDefId, v: Visibility) -> PerNs { - PerNs { types: None, values: None, macros: Some((macro_, v)) } - } - - pub fn is_none(&self) -> bool { - self.types.is_none() && self.values.is_none() && self.macros.is_none() - } - - pub fn take_types(self) -> Option { - self.types.map(|it| it.0) - } - - pub fn take_types_vis(self) -> Option<(ModuleDefId, Visibility)> { - self.types - } - - pub fn take_values(self) -> Option { - self.values.map(|it| it.0) - } - - pub fn take_macros(self) -> Option { - self.macros.map(|it| it.0) - } - - pub fn filter_visibility(self, mut f: impl FnMut(Visibility) -> bool) -> PerNs { - PerNs { - types: self.types.filter(|(_, v)| f(*v)), - values: self.values.filter(|(_, v)| f(*v)), - macros: self.macros.filter(|(_, v)| f(*v)), - } - } - - pub fn with_visibility(self, vis: Visibility) -> PerNs { - PerNs { - types: self.types.map(|(it, _)| (it, vis)), - values: self.values.map(|(it, _)| (it, vis)), - macros: self.macros.map(|(it, _)| (it, vis)), - } - } - - pub fn or(self, other: PerNs) -> PerNs { - PerNs { - types: self.types.or(other.types), - values: self.values.or(other.values), - macros: self.macros.or(other.macros), - } - } - - pub fn iter_items(self) -> impl Iterator { - self.types - .map(|it| ItemInNs::Types(it.0)) - .into_iter() - .chain(self.values.map(|it| ItemInNs::Values(it.0)).into_iter()) - .chain(self.macros.map(|it| ItemInNs::Macros(it.0)).into_iter()) - } -} -- cgit v1.2.3