language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 05:15:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

make a bunch of stuff private

Browse source
This commit is contained in:
Aleksey Kladov 2018-11-28 16:24:06 +03:00
parent e89700f967
commit d30bbfda74
2 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/ra_hir/src/module/mod.rs
View file

@ -26,8 +26,7 @@ pub use self::nameres::ModuleScope;
pub struct Module { pub struct Module {
tree: Arc<ModuleTree>, tree: Arc<ModuleTree>,
source_root_id: SourceRootId, source_root_id: SourceRootId,
//TODO: make private module_id: ModuleId,
pub module_id: ModuleId,
} }
impl Module { impl Module {
@ -122,7 +121,6 @@ impl Module {
} }
/// `name` is `None` for the crate's root module /// `name` is `None` for the crate's root module
#[allow(unused)]
pub fn name(&self) -> Option<SmolStr> { pub fn name(&self) -> Option<SmolStr> {
let link = self.module_id.parent_link(&self.tree)?; let link = self.module_id.parent_link(&self.tree)?;
Some(link.name(&self.tree)) Some(link.name(&self.tree))
@ -218,7 +216,7 @@ pub enum ModuleSource {
/// An owned syntax node for a module. Unlike `ModuleSource`, /// An owned syntax node for a module. Unlike `ModuleSource`,
/// this holds onto the AST for the whole file. /// this holds onto the AST for the whole file.
pub enum ModuleSourceNode { pub(crate) enum ModuleSourceNode {
SourceFile(ast::SourceFileNode), SourceFile(ast::SourceFileNode),
Module(ast::ModuleNode), Module(ast::ModuleNode),
} }
@ -338,7 +336,7 @@ impl ModuleSource {
} }
} }
pub fn resolve(self, db: &impl HirDatabase) -> ModuleSourceNode { pub(crate) fn resolve(self, db: &impl HirDatabase) -> ModuleSourceNode {
match self { match self {
ModuleSource::SourceFile(file_id) => { ModuleSource::SourceFile(file_id) => {
let syntax = db.source_file(file_id); let syntax = db.source_file(file_id);

12
crates/ra_hir/src/module/nameres.rs
View file

@ -44,7 +44,7 @@ pub struct ItemMap {
#[derive(Debug, Default, PartialEq, Eq, Clone)] #[derive(Debug, Default, PartialEq, Eq, Clone)]
pub struct ModuleScope { pub struct ModuleScope {
pub items: FxHashMap<SmolStr, Resolution>, items: FxHashMap<SmolStr, Resolution>,
} }
impl ModuleScope { impl ModuleScope {
@ -200,11 +200,11 @@ impl ModuleItem {
} }
pub(crate) struct Resolver<'a, DB> { pub(crate) struct Resolver<'a, DB> {
pub db: &'a DB, pub(crate) db: &'a DB,
pub input: &'a FxHashMap<ModuleId, Arc<InputModuleItems>>, pub(crate) input: &'a FxHashMap<ModuleId, Arc<InputModuleItems>>,
pub source_root: SourceRootId, pub(crate) source_root: SourceRootId,
pub module_tree: Arc<ModuleTree>, pub(crate) module_tree: Arc<ModuleTree>,
pub result: ItemMap, pub(crate) result: ItemMap,
} }
impl<'a, DB> Resolver<'a, DB> impl<'a, DB> Resolver<'a, DB>