From 2e123aef706ac12e1277b90c933055d0b4b79d9b Mon Sep 17 00:00:00 2001
From: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
Date: Fri, 2 Jan 2026 14:29:23 +0300
Subject: [PATCH] resolve: Avoid additional ambiguities from splitting modules
 into two scopes

---
 compiler/rustc_resolve/src/ident.rs        | 15 ++++++++++++-
 tests/ui/imports/overwritten-glob-ambig.rs | 26 ++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 tests/ui/imports/overwritten-glob-ambig.rs

diff --git a/compiler/rustc_resolve/src/ident.rs b/compiler/rustc_resolve/src/ident.rs
index f400ae8f6439..c9f560d2a6fa 100644
--- a/compiler/rustc_resolve/src/ident.rs
+++ b/compiler/rustc_resolve/src/ident.rs
@@ -828,8 +828,21 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
                 && innermost_results[1..].iter().any(|(b, s)| {
                     matches!(s, Scope::ExternPreludeItems) && *b != innermost_binding
                 });
+            // Skip ambiguity errors for nonglob module bindings "overridden"
+            // by glob module bindings in the same module.
+            // FIXME: Remove with lang team approval.
+            let issue_149681_hack = match scope {
+                Scope::ModuleGlobs(m1, _)
+                    if innermost_results[1..]
+                        .iter()
+                        .any(|(_, s)| matches!(*s, Scope::ModuleNonGlobs(m2, _) if m1 == m2)) =>
+                {
+                    true
+                }
+                _ => false,
+            };
 
-            if issue_145575_hack {
+            if issue_145575_hack || issue_149681_hack {
                 self.issue_145575_hack_applied = true;
             } else {
                 self.ambiguity_errors.push(AmbiguityError {
diff --git a/tests/ui/imports/overwritten-glob-ambig.rs b/tests/ui/imports/overwritten-glob-ambig.rs
new file mode 100644
index 000000000000..a5918568c62a
--- /dev/null
+++ b/tests/ui/imports/overwritten-glob-ambig.rs
@@ -0,0 +1,26 @@
+// Test for a regression introduced by splitting module scope into two scopes
+// (similar to issue #145575).
+
+//@ check-pass
+//@ edition: 2018..
+
+#[macro_use]
+mod one {
+    // Macro that is in a different module, but still in scope due to `macro_use`
+    macro_rules! mac { () => {} }
+    pub(crate) use mac;
+}
+
+mod other {
+    macro_rules! mac { () => {} }
+    pub(crate) use mac;
+}
+
+// Single import of the same in the current module.
+use one::mac;
+// Glob import of a different macro in the current module (should be an ambiguity).
+use other::*;
+
+fn main() {
+    mac!(); // OK for now, the ambiguity is not reported
+}