Skip to content

Commit 032eb3d

Browse files
committed
Remove almost unused ModuleSource::new
1 parent 5c5f90b commit 032eb3d

File tree

2 files changed

+2
-20
lines changed

2 files changed

+2
-20
lines changed

crates/ra_hir/src/from_source.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ impl Module {
238238
_ => {
239239
let src_parent = InFile {
240240
file_id: src.file_id,
241-
value: ModuleSource::new(db, Some(src.file_id.original_file(db)), None),
241+
value: ModuleSource::from_file_id(db, src.file_id.original_file(db)),
242242
};
243243
Module::from_definition(db, src_parent)
244244
}

crates/ra_hir_def/src/nameres.rs

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -356,32 +356,14 @@ impl ModuleData {
356356
}
357357
}
358358

359+
#[derive(Debug, Clone, PartialEq, Eq)]
359360
pub enum ModuleSource {
360361
SourceFile(ast::SourceFile),
361362
Module(ast::Module),
362363
Block(ast::Block),
363364
}
364365

365366
impl ModuleSource {
366-
pub fn new(
367-
db: &impl DefDatabase,
368-
file_id: Option<FileId>,
369-
decl_id: Option<AstId<ast::Module>>,
370-
) -> ModuleSource {
371-
match (file_id, decl_id) {
372-
(Some(file_id), _) => {
373-
let source_file = db.parse(file_id).tree();
374-
ModuleSource::SourceFile(source_file)
375-
}
376-
(None, Some(item_id)) => {
377-
let module = item_id.to_node(db);
378-
assert!(module.item_list().is_some(), "expected inline module");
379-
ModuleSource::Module(module)
380-
}
381-
(None, None) => panic!(),
382-
}
383-
}
384-
385367
// FIXME: this methods do not belong here
386368
pub fn from_position(db: &impl DefDatabase, position: FilePosition) -> ModuleSource {
387369
let parse = db.parse(position.file_id);

0 commit comments

Comments
 (0)