Avoid prematurely choosing a glob import

compiler/rustc_resolve/src/ident.rs

@@ -1366,7 +1366,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
                 &single_import.parent_scope,
                 None,
                 ignore_decl,
-                ignore_import,
+                None,
             ) {
                 Err(Determined) => continue,
                 Ok(binding)

tests/ui/imports/inconsistent-resolution-153842.rs

@@ -0,0 +1,17 @@
+mod a {
+    pub use crate::s::Trait as s;
+    //~^ ERROR cannot determine resolution for the import
+    //~| ERROR cannot determine resolution for the import
+    //~| ERROR unresolved imports `crate::s::Trait`, `a::s`
+}
+
+mod b {
+    pub mod s {
+        pub trait Trait {}
+    }
+}
+
+use a::s;
+use b::*;
+
+fn main() {}

tests/ui/imports/inconsistent-resolution-153842.stderr

@@ -0,0 +1,26 @@
+error: cannot determine resolution for the import
+  --> $DIR/inconsistent-resolution-153842.rs:2:13
+   |
+LL |     pub use crate::s::Trait as s;
+   |             ^^^^^^^^^^^^^^^^^^^^
+
+error: cannot determine resolution for the import
+  --> $DIR/inconsistent-resolution-153842.rs:2:13
+   |
+LL |     pub use crate::s::Trait as s;
+   |             ^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
+
+error[E0432]: unresolved imports `crate::s::Trait`, `a::s`
+  --> $DIR/inconsistent-resolution-153842.rs:2:13
+   |
+LL |     pub use crate::s::Trait as s;
+   |             ^^^^^^^^^^^^^^^^^^^^
+...
+LL | use a::s;
+   |     ^^^^
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0432`.