Skip to content

Commit 18b59f5

Browse files
committed
resolve: Minor cleanup to Resolver::get_module
1 parent 52c7397 commit 18b59f5

File tree

1 file changed

+16
-19
lines changed

1 file changed

+16
-19
lines changed

compiler/rustc_resolve/src/build_reduced_graph.rs

+16-19
Original file line numberDiff line numberDiff line change
@@ -115,27 +115,24 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
115115

116116
if !def_id.is_local() {
117117
let def_kind = self.cstore().def_kind(def_id);
118-
match def_kind {
119-
DefKind::Mod | DefKind::Enum | DefKind::Trait => {
120-
let parent = self
121-
.tcx
122-
.opt_parent(def_id)
123-
.map(|parent_id| self.get_nearest_non_block_module(parent_id));
124-
let expn_id = self.cstore().module_expansion_untracked(def_id, &self.tcx.sess);
125-
Some(self.new_module(
126-
parent,
127-
ModuleKind::Def(def_kind, def_id, self.tcx.item_name(def_id)),
128-
expn_id,
129-
self.def_span(def_id),
130-
// FIXME: Account for `#[no_implicit_prelude]` attributes.
131-
parent.map_or(false, |module| module.no_implicit_prelude),
132-
))
133-
}
134-
_ => None,
118+
if let DefKind::Mod | DefKind::Enum | DefKind::Trait = def_kind {
119+
let parent = self
120+
.tcx
121+
.opt_parent(def_id)
122+
.map(|parent_id| self.get_nearest_non_block_module(parent_id));
123+
let expn_id = self.cstore().module_expansion_untracked(def_id, &self.tcx.sess);
124+
return Some(self.new_module(
125+
parent,
126+
ModuleKind::Def(def_kind, def_id, self.tcx.item_name(def_id)),
127+
expn_id,
128+
self.def_span(def_id),
129+
// FIXME: Account for `#[no_implicit_prelude]` attributes.
130+
parent.map_or(false, |module| module.no_implicit_prelude),
131+
));
135132
}
136-
} else {
137-
None
138133
}
134+
135+
None
139136
}
140137

141138
pub(crate) fn expn_def_scope(&mut self, expn_id: ExpnId) -> Module<'a> {

0 commit comments

Comments
 (0)