itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 11:31:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

reduce visibility

Browse Source
This commit is contained in:
Aleksey Kladov 2019-03-26 13:53:50 +03:00
parent 5270bca5f7
commit e4646ce0d5
1 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
crates/ra_hir/src/nameres/raw.rs
View File

@ -15,6 +15,10 @@ use crate::{
ids::{SourceFileItemId, SourceFileItems}, ids::{SourceFileItemId, SourceFileItems},
}; };
/// `RawItems` is a set of top-level items in a file (except for impls).
///
/// It is the input to name resolution algorithm. `RawItems` are not invalidated
/// on most edits.
#[derive(Debug, Default, PartialEq, Eq)] #[derive(Debug, Default, PartialEq, Eq)]
pub struct RawItems { pub struct RawItems {
modules: Arena<Module, ModuleData>, modules: Arena<Module, ModuleData>,
@ -31,11 +35,11 @@ pub struct ImportSourceMap {
} }
impl ImportSourceMap { impl ImportSourceMap {
pub(crate) fn insert(&mut self, import: ImportId, segment: &ast::PathSegment) { fn insert(&mut self, import: ImportId, segment: &ast::PathSegment) {
self.map.insert(import, AstPtr::new(segment)) self.map.insert(import, AstPtr::new(segment))
} }
pub fn get(&self, source: &ModuleSource, import: ImportId) -> TreeArc<ast::PathSegment> { pub(crate) fn get(&self, source: &ModuleSource, import: ImportId) -> TreeArc<ast::PathSegment> {
let file = match source { let file = match source {
ModuleSource::SourceFile(file) => &*file, ModuleSource::SourceFile(file) => &*file,
ModuleSource::Module(m) => m.syntax().ancestors().find_map(SourceFile::cast).unwrap(), ModuleSource::Module(m) => m.syntax().ancestors().find_map(SourceFile::cast).unwrap(),
@ -64,7 +68,7 @@ impl RawItems {
(Arc::new(collector.raw_items), Arc::new(collector.source_map)) (Arc::new(collector.raw_items), Arc::new(collector.source_map))
} }
pub(crate) fn items(&self) -> &[RawItem] { pub(super) fn items(&self) -> &[RawItem] {
&self.items &self.items
} }
} }
@ -98,7 +102,7 @@ impl Index<Macro> for RawItems {
} }
#[derive(Debug, PartialEq, Eq, Clone, Copy)] #[derive(Debug, PartialEq, Eq, Clone, Copy)]
pub(crate) enum RawItem { pub(super) enum RawItem {
Module(Module), Module(Module),
Import(ImportId), Import(ImportId),
Def(Def), Def(Def),
@ -106,11 +110,11 @@ pub(crate) enum RawItem {
} }
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub(crate) struct Module(RawId); pub(super) struct Module(RawId);
impl_arena_id!(Module); impl_arena_id!(Module);
#[derive(Debug, PartialEq, Eq)] #[derive(Debug, PartialEq, Eq)]
pub(crate) enum ModuleData { pub(super) enum ModuleData {
Declaration { name: Name, source_item_id: SourceFileItemId }, Declaration { name: Name, source_item_id: SourceFileItemId },
Definition { name: Name, source_item_id: SourceFileItemId, items: Vec<RawItem> }, Definition { name: Name, source_item_id: SourceFileItemId, items: Vec<RawItem> },
} }
@ -121,26 +125,26 @@ impl_arena_id!(ImportId);
#[derive(Debug, Clone, PartialEq, Eq)] #[derive(Debug, Clone, PartialEq, Eq)]
pub struct ImportData { pub struct ImportData {
pub(crate) path: Path, pub(super) path: Path,
pub(crate) alias: Option<Name>, pub(super) alias: Option<Name>,
pub(crate) is_glob: bool, pub(super) is_glob: bool,
pub(crate) is_prelude: bool, pub(super) is_prelude: bool,
pub(crate) is_extern_crate: bool, pub(super) is_extern_crate: bool,
} }
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub(crate) struct Def(RawId); pub(super) struct Def(RawId);
impl_arena_id!(Def); impl_arena_id!(Def);
#[derive(Debug, PartialEq, Eq)] #[derive(Debug, PartialEq, Eq)]
pub(crate) struct DefData { pub(super) struct DefData {
pub(crate) source_item_id: SourceFileItemId, pub(super) source_item_id: SourceFileItemId,
pub(crate) name: Name, pub(super) name: Name,
pub(crate) kind: DefKind, pub(super) kind: DefKind,
} }
#[derive(Debug, PartialEq, Eq, Clone, Copy)] #[derive(Debug, PartialEq, Eq, Clone, Copy)]
pub(crate) enum DefKind { pub(super) enum DefKind {
Function, Function,
Struct, Struct,
Enum, Enum,
@ -151,15 +155,15 @@ pub(crate) enum DefKind {
} }
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub(crate) struct Macro(RawId); pub(super) struct Macro(RawId);
impl_arena_id!(Macro); impl_arena_id!(Macro);
#[derive(Debug, PartialEq, Eq)] #[derive(Debug, PartialEq, Eq)]
pub(crate) struct MacroData { pub(super) struct MacroData {
pub(crate) source_item_id: SourceFileItemId, pub(super) source_item_id: SourceFileItemId,
pub(crate) path: Path, pub(super) path: Path,
pub(crate) name: Option<Name>, pub(super) name: Option<Name>,
pub(crate) export: bool, pub(super) export: bool,
} }
struct RawItemsCollector { struct RawItemsCollector {