Skip to content

Commit 7702f69

Browse files
committed
One pub function less is good!
1 parent 7629158 commit 7702f69

File tree

3 files changed

+7
-12
lines changed

3 files changed

+7
-12
lines changed

crates/ra_hir/src/from_source.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -235,11 +235,10 @@ impl Module {
235235
let src_parent = InFile { file_id: src.file_id, value: parent_declaration };
236236
Module::from_declaration(db, src_parent)
237237
}
238-
_ => {
239-
let src_parent = InFile {
240-
file_id: src.file_id,
241-
value: ModuleSource::from_file_id(db, src.file_id.original_file(db)),
242-
};
238+
None => {
239+
let source_file = db.parse(src.file_id.original_file(db)).tree();
240+
let src_parent =
241+
InFile { file_id: src.file_id, value: ModuleSource::SourceFile(source_file) };
243242
Module::from_definition(db, src_parent)
244243
}
245244
}?;

crates/ra_hir_def/src/nameres.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -390,11 +390,6 @@ impl ModuleSource {
390390
ModuleSource::SourceFile(source_file)
391391
}
392392
}
393-
394-
pub fn from_file_id(db: &impl DefDatabase, file_id: FileId) -> ModuleSource {
395-
let source_file = db.parse(file_id).tree();
396-
ModuleSource::SourceFile(source_file)
397-
}
398393
}
399394

400395
mod diagnostics {

crates/ra_ide/src/parent_module.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! FIXME: write short doc here
22
3-
use ra_db::{CrateId, FileId, FilePosition};
3+
use ra_db::{CrateId, FileId, FilePosition, SourceDatabase};
44

55
use crate::{db::RootDatabase, NavigationTarget};
66

@@ -21,7 +21,8 @@ pub(crate) fn parent_module(db: &RootDatabase, position: FilePosition) -> Vec<Na
2121

2222
/// Returns `Vec` for the same reason as `parent_module`
2323
pub(crate) fn crate_for(db: &RootDatabase, file_id: FileId) -> Vec<CrateId> {
24-
let src = hir::ModuleSource::from_file_id(db, file_id);
24+
let source_file = db.parse(file_id).tree();
25+
let src = hir::ModuleSource::SourceFile(source_file);
2526
let module =
2627
match hir::Module::from_definition(db, hir::InFile { file_id: file_id.into(), value: src })
2728
{

0 commit comments

Comments
 (0)