Skip to content

Commit 8021ede

Browse files
committed
nit: clean up some redundant code.
1 parent b46ce08 commit 8021ede

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

src/librustc_resolve/build_reduced_graph.rs

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -221,17 +221,13 @@ impl<'b> Resolver<'b> {
221221
legacy_imports.import_all.is_some() || !legacy_imports.imports.is_empty() ||
222222
!legacy_imports.reexports.is_empty()
223223
} {
224-
if self.current_module.parent.is_some() {
225-
span_err!(self.session, item.span, E0468,
226-
"an `extern crate` loading macros must be at the crate root");
227-
}
224+
span_err!(self.session, item.span, E0468,
225+
"an `extern crate` loading macros must be at the crate root");
228226
}
229227

230-
let loaded_macros = if legacy_imports != LegacyMacroImports::default() {
231-
self.crate_loader.process_item(item, &self.definitions, true)
232-
} else {
233-
self.crate_loader.process_item(item, &self.definitions, false)
234-
};
228+
let load_macros = legacy_imports != LegacyMacroImports::default();
229+
let loaded_macros =
230+
self.crate_loader.process_item(item, &self.definitions, load_macros);
235231

236232
// n.b. we don't need to look at the path option here, because cstore already did
237233
let crate_id = self.session.cstore.extern_mod_stmt_cnum(item.id);

0 commit comments

Comments
 (0)