From d30bbfda74346c5007174d8bda93e9583c166a4c Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 28 Nov 2018 16:24:06 +0300 Subject: make a bunch of stuff private --- crates/ra_hir/src/module/mod.rs | 8 +++----- crates/ra_hir/src/module/nameres.rs | 12 ++++++------ 2 files changed, 9 insertions(+), 11 deletions(-) (limited to 'crates') diff --git a/crates/ra_hir/src/module/mod.rs b/crates/ra_hir/src/module/mod.rs index a011fd53e..3ae83d8cb 100644 --- a/crates/ra_hir/src/module/mod.rs +++ b/crates/ra_hir/src/module/mod.rs @@ -26,8 +26,7 @@ pub use self::nameres::ModuleScope; pub struct Module { tree: Arc, source_root_id: SourceRootId, - //TODO: make private - pub module_id: ModuleId, + module_id: ModuleId, } impl Module { @@ -122,7 +121,6 @@ impl Module { } /// `name` is `None` for the crate's root module - #[allow(unused)] pub fn name(&self) -> Option { let link = self.module_id.parent_link(&self.tree)?; Some(link.name(&self.tree)) @@ -218,7 +216,7 @@ pub enum ModuleSource { /// An owned syntax node for a module. Unlike `ModuleSource`, /// this holds onto the AST for the whole file. -pub enum ModuleSourceNode { +pub(crate) enum ModuleSourceNode { SourceFile(ast::SourceFileNode), 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 { ModuleSource::SourceFile(file_id) => { let syntax = db.source_file(file_id); diff --git a/crates/ra_hir/src/module/nameres.rs b/crates/ra_hir/src/module/nameres.rs index de13835b2..6445d5349 100644 --- a/crates/ra_hir/src/module/nameres.rs +++ b/crates/ra_hir/src/module/nameres.rs @@ -44,7 +44,7 @@ pub struct ItemMap { #[derive(Debug, Default, PartialEq, Eq, Clone)] pub struct ModuleScope { - pub items: FxHashMap, + items: FxHashMap, } impl ModuleScope { @@ -200,11 +200,11 @@ impl ModuleItem { } pub(crate) struct Resolver<'a, DB> { - pub db: &'a DB, - pub input: &'a FxHashMap>, - pub source_root: SourceRootId, - pub module_tree: Arc, - pub result: ItemMap, + pub(crate) db: &'a DB, + pub(crate) input: &'a FxHashMap>, + pub(crate) source_root: SourceRootId, + pub(crate) module_tree: Arc, + pub(crate) result: ItemMap, } impl<'a, DB> Resolver<'a, DB> -- cgit v1.2.3