address review

Author: LorrensP-2158466

compiler/rustc_resolve/src/build_reduced_graph.rs

@@ -33,7 +33,6 @@ use tracing::debug;
 
 use crate::Namespace::{MacroNS, TypeNS, ValueNS};
 use crate::def_collector::collect_definitions;
-use crate::errors::CannotGlobImportAllCrates;
 use crate::imports::{ImportData, ImportKind};
 use crate::macros::{MacroRulesBinding, MacroRulesScope, MacroRulesScopeRef};
 use crate::{
@@ -659,16 +658,15 @@ impl<'a, 'ra, 'tcx> BuildReducedGraphVisitor<'a, 'ra, 'tcx> {
                 if !ast::attr::contains_name(&item.attrs, sym::prelude_import) {
                     let kind = ImportKind::Glob { max_vis: Cell::new(None), id };
                     self.add_import(prefix, kind, use_tree.span, item, root_span, item.id, vis);
-                    return;
-                }
-                // Resolve the prelude import early.
-                let path_res =
-                    self.r.cm().maybe_resolve_path(&prefix, None, &self.parent_scope, None);
-                if let PathResult::Module(ModuleOrUniformRoot::Module(module)) = path_res {
-                    self.r.prelude = Some(module);
                 } else {
-                    // Same as in `imports::resolve_glob_import`
-                    self.r.dcx().emit_err(CannotGlobImportAllCrates { span: use_tree.span });
+                    // Resolve the prelude import early.
+                    let path_res =
+                        self.r.cm().maybe_resolve_path(&prefix, None, &self.parent_scope, None);
+                    if let PathResult::Module(ModuleOrUniformRoot::Module(module)) = path_res {
+                        self.r.prelude = Some(module);
+                    } else {
+                        self.r.dcx().span_err(use_tree.span, "cannot resolve a prelude import");
+                    }
                 }
             }
             ast::UseTreeKind::Nested { ref items, .. } => {

library/core/src/lib.rs

@@ -211,6 +211,7 @@
 extern crate self as core;
 
 /* The core prelude, not as all-encompassing as the std prelude */
+// The comiler expects the prelude definition to be defined before it's use.
 pub mod prelude;
 
 #[prelude_import]

library/std/src/lib.rs

@@ -422,6 +422,7 @@
 #![default_lib_allocator]
 
 // The Rust prelude
+// The comiler expects the prelude definition to be defined before it's use.
 pub mod prelude;
 
 // Explicitly import the prelude. The compiler uses this same unstable attribute

tests/ui/resolve/custom-inner-attribute.rs

@@ -0,0 +1,11 @@
+//@ check-pass
+//! This test checks that macro names resolved from the libstd prelude
+//! still work even if there's a crate-level custom inner attribute.
+
+#![feature(custom_inner_attributes)]
+
+#![rustfmt::skip]
+
+fn main() {
+    let _ = todo!();
+}