Skip to content

Commit 1e35c74

Browse files
bors[bot]matklad
andauthored
Merge #4941
4941: Simplify r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
2 parents f7f627d + 42be05a commit 1e35c74

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

crates/ra_hir_def/src/nameres.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,6 @@ impl Default for ModuleOrigin {
119119
}
120120

121121
impl ModuleOrigin {
122-
pub(crate) fn not_sure_file(file: Option<FileId>, declaration: AstId<ast::Module>) -> Self {
123-
match file {
124-
None => ModuleOrigin::Inline { definition: declaration },
125-
Some(definition) => ModuleOrigin::File { declaration, definition },
126-
}
127-
}
128-
129122
fn declaration(&self) -> Option<AstId<ast::Module>> {
130123
match self {
131124
ModuleOrigin::File { declaration: module, .. }

crates/ra_hir_def/src/nameres/collector.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -825,7 +825,10 @@ impl ModCollector<'_, '_> {
825825
let modules = &mut self.def_collector.def_map.modules;
826826
let res = modules.alloc(ModuleData::default());
827827
modules[res].parent = Some(self.module_id);
828-
modules[res].origin = ModuleOrigin::not_sure_file(definition, declaration);
828+
modules[res].origin = match definition {
829+
None => ModuleOrigin::Inline { definition: declaration },
830+
Some(definition) => ModuleOrigin::File { declaration, definition },
831+
};
829832
for (name, mac) in modules[self.module_id].scope.collect_legacy_macros() {
830833
modules[res].scope.define_legacy_macro(name, mac)
831834
}

0 commit comments

Comments
 (0)