mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

One pub function less is good!

Browse Source
This commit is contained in:
ice1000 2019-12-05 08:28:31 -05:00
parent 762915826a
commit 7702f690a9
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crates/ra_hir/src/from_source.rs
View File

@ -235,11 +235,10 @@ impl Module {
let src_parent = InFile { file_id: src.file_id, value: parent_declaration }; let src_parent = InFile { file_id: src.file_id, value: parent_declaration };
Module::from_declaration(db, src_parent) Module::from_declaration(db, src_parent)
} }
_ => { None => {
let src_parent = InFile { let source_file = db.parse(src.file_id.original_file(db)).tree();
file_id: src.file_id, let src_parent =
value: ModuleSource::from_file_id(db, src.file_id.original_file(db)), InFile { file_id: src.file_id, value: ModuleSource::SourceFile(source_file) };
};
Module::from_definition(db, src_parent) Module::from_definition(db, src_parent)
} }
}?; }?;

5
crates/ra_hir_def/src/nameres.rs
View File

@ -390,11 +390,6 @@ impl ModuleSource {
ModuleSource::SourceFile(source_file) ModuleSource::SourceFile(source_file)
} }
} }
pub fn from_file_id(db: &impl DefDatabase, file_id: FileId) -> ModuleSource {
let source_file = db.parse(file_id).tree();
ModuleSource::SourceFile(source_file)
}
} }
mod diagnostics { mod diagnostics {

5
crates/ra_ide/src/parent_module.rs
View File

@ -1,6 +1,6 @@
//! FIXME: write short doc here //! FIXME: write short doc here
use ra_db::{CrateId, FileId, FilePosition}; use ra_db::{CrateId, FileId, FilePosition, SourceDatabase};
use crate::{db::RootDatabase, NavigationTarget}; use crate::{db::RootDatabase, NavigationTarget};
@ -21,7 +21,8 @@ pub(crate) fn parent_module(db: &RootDatabase, position: FilePosition) -> Vec<Na
/// Returns `Vec` for the same reason as `parent_module` /// Returns `Vec` for the same reason as `parent_module`
pub(crate) fn crate_for(db: &RootDatabase, file_id: FileId) -> Vec<CrateId> { pub(crate) fn crate_for(db: &RootDatabase, file_id: FileId) -> Vec<CrateId> {
let src = hir::ModuleSource::from_file_id(db, file_id); let source_file = db.parse(file_id).tree();
let src = hir::ModuleSource::SourceFile(source_file);
let module = let module =
match hir::Module::from_definition(db, hir::InFile { file_id: file_id.into(), value: src }) match hir::Module::from_definition(db, hir::InFile { file_id: file_id.into(), value: src })
{ {