Ignore paths from expansion in unused_qualifications

rust-lang · Mar 20, 2024 · a845246 · a845246
1 parent c86f3ac
commit a845246
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/compiler/rustc_resolve/src/late.rs b/compiler/rustc_resolve/src/late.rs
@@ -4672,7 +4672,9 @@ impl<'a: 'ast, 'b, 'ast, 'tcx> LateResolutionVisitor<'a, 'b, 'ast, 'tcx> {
             return;
         }
 
-        if path.iter().any(|seg| seg.ident.span.from_expansion()) {
+        if finalize.path_span.from_expansion()
+            || path.iter().any(|seg| seg.ident.span.from_expansion())
+        {
             return;
         }
 

diff --git a/tests/ui/lint/lint-qualification.fixed b/tests/ui/lint/lint-qualification.fixed
@@ -35,6 +35,7 @@ fn main() {
         foo::bar();
         foo::$b(); // issue #96698
         $a::bar();
+        $a::$b();
     } }
     m!(foo, bar);
 }

diff --git a/tests/ui/lint/lint-qualification.rs b/tests/ui/lint/lint-qualification.rs
@@ -35,6 +35,7 @@ fn main() {
         foo::bar();
         foo::$b(); // issue #96698
         $a::bar();
+        $a::$b();
     } }
     m!(foo, bar);
 }
-Original file line number
+Diff line change
@@ Expand Up @@
                 return;
             }
-            if path.iter().any(|seg| seg.ident.span.from_expansion()) {
+            if finalize.path_span.from_expansion()
+                || path.iter().any(|seg| seg.ident.span.from_expansion())
+            {
                 return;
             }
@@ Expand Down @@