From 8021ede6011a3fc4f74079b8f8f45df252e6f53a Mon Sep 17 00:00:00 2001 From: Jeffrey Seyfried Date: Wed, 26 Oct 2016 05:45:19 +0000 Subject: [PATCH] nit: clean up some redundant code. --- src/librustc_resolve/build_reduced_graph.rs | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/librustc_resolve/build_reduced_graph.rs b/src/librustc_resolve/build_reduced_graph.rs index cb8dd7250b4..475d454e220 100644 --- a/src/librustc_resolve/build_reduced_graph.rs +++ b/src/librustc_resolve/build_reduced_graph.rs @@ -221,17 +221,13 @@ fn build_reduced_graph_for_item(&mut self, item: &Item, expansion: Mark) { legacy_imports.import_all.is_some() || !legacy_imports.imports.is_empty() || !legacy_imports.reexports.is_empty() } { - if self.current_module.parent.is_some() { - span_err!(self.session, item.span, E0468, - "an `extern crate` loading macros must be at the crate root"); - } + span_err!(self.session, item.span, E0468, + "an `extern crate` loading macros must be at the crate root"); } - let loaded_macros = if legacy_imports != LegacyMacroImports::default() { - self.crate_loader.process_item(item, &self.definitions, true) - } else { - self.crate_loader.process_item(item, &self.definitions, false) - }; + let load_macros = legacy_imports != LegacyMacroImports::default(); + let loaded_macros = + self.crate_loader.process_item(item, &self.definitions, load_macros); // n.b. we don't need to look at the path option here, because cstore already did let crate_id = self.session.cstore.extern_mod_stmt_cnum(item.id); -- GitLab