don't stop after successful non-glob resolution

Author: b-naber

compiler/rustc_resolve/src/ident.rs

@@ -549,12 +549,6 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
                                     );
                                 }
 
-                                // Don't visit Scope::GlobModule after successful resolution in
-                                // Scope::NonGlobModule with ScopeSet::Module.
-                                if matches!(scope_set, ScopeSet::Module(..)) {
-                                    return Some(Ok(binding));
-                                }
-
                                 let misc_flags = this.create_module_misc_flags(module);
                                 Ok((binding, Flags::NON_GLOB_MODULE | misc_flags))
                             }

tests/ui/imports/imports.rs

@@ -1,4 +1,3 @@
-//@ run-pass
 #![allow(unused)]
 
 // Like other items, private imports can be imported and used non-lexically in paths.
@@ -22,13 +21,15 @@ fn g() {
     use crate::bar::*;
     fn f() -> bool { true }
     let _: bool = f();
+    //~^ ERROR `f` is ambiguous
 }
 
 fn h() {
     use crate::foo::*;
     use crate::bar::*;
     use crate::f;
     let _: bool = f();
+    //~^ ERROR `f` is ambiguous
 }
 
 // Here, there appears to be shadowing but isn't because of namespaces.

tests/ui/imports/imports.stderr

@@ -0,0 +1,43 @@
+error[E0659]: `f` is ambiguous
+  --> $DIR/imports.rs:23:19
+   |
+LL |     let _: bool = f();
+   |                   ^ ambiguous name
+   |
+   = note: ambiguous because of multiple glob imports of a name in the same module
+note: `f` could refer to the function imported here
+  --> $DIR/imports.rs:20:9
+   |
+LL |     use crate::foo::*;
+   |         ^^^^^^^^^^^^^
+   = help: consider adding an explicit import of `f` to disambiguate
+note: `f` could also refer to the function imported here
+  --> $DIR/imports.rs:21:9
+   |
+LL |     use crate::bar::*;
+   |         ^^^^^^^^^^^^^
+   = help: consider adding an explicit import of `f` to disambiguate
+
+error[E0659]: `f` is ambiguous
+  --> $DIR/imports.rs:31:19
+   |
+LL |     let _: bool = f();
+   |                   ^ ambiguous name
+   |
+   = note: ambiguous because of multiple glob imports of a name in the same module
+note: `f` could refer to the function imported here
+  --> $DIR/imports.rs:28:9
+   |
+LL |     use crate::foo::*;
+   |         ^^^^^^^^^^^^^
+   = help: consider adding an explicit import of `f` to disambiguate
+note: `f` could also refer to the function imported here
+  --> $DIR/imports.rs:29:9
+   |
+LL |     use crate::bar::*;
+   |         ^^^^^^^^^^^^^
+   = help: consider adding an explicit import of `f` to disambiguate
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0659`.

tests/ui/resolve/issue-109153.rs

@@ -10,5 +10,6 @@ mod foo {
 
 use bar::bar; //~ ERROR `bar` is ambiguous
 use bar::*;
+//~^ ERROR `bar` is ambiguous
 
 fn main() { }

tests/ui/resolve/issue-109153.stderr

@@ -18,6 +18,26 @@ LL | use bar::*;
    |     ^^^^^^
    = help: consider adding an explicit import of `bar` to disambiguate
 
-error: aborting due to 1 previous error
+error[E0659]: `bar` is ambiguous
+  --> $DIR/issue-109153.rs:12:5
+   |
+LL | use bar::*;
+   |     ^^^ ambiguous name
+   |
+   = note: ambiguous because of multiple glob imports of a name in the same module
+note: `bar` could refer to the module imported here
+  --> $DIR/issue-109153.rs:1:5
+   |
+LL | use foo::*;
+   |     ^^^^^^
+   = help: consider adding an explicit import of `bar` to disambiguate
+note: `bar` could also refer to the module imported here
+  --> $DIR/issue-109153.rs:12:5
+   |
+LL | use bar::*;
+   |     ^^^^^^
+   = help: consider adding an explicit import of `bar` to disambiguate
+
+error: aborting due to 2 previous errors
 
 For more information about this error, try `rustc --explain E0659`.