Also signal generics that may need to be moved

Author: Urgau

compiler/rustc_lint/src/non_local_def.rs

@@ -221,6 +221,7 @@ impl<'tcx> LateLintPass<'tcx> for NonLocalDefinitions {
                 if let Some(of_trait) = &impl_.of_trait {
                     collector.visit_trait_ref(of_trait);
                 }
+                collector.visit_generics(&impl_.generics);
 
                 let may_move: Vec<Span> = collector
                     .paths

tests/ui/lint/non-local-defs/generics.stderr

@@ -10,7 +10,9 @@ help: move this `impl` block outside of the current function `main`
   --> $DIR/generics.rs:9:5
    |
 LL |     impl<T: Local> Global for Vec<T> { }
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |     ^^^^^^^^-----^^^^^^^^^^^^^^^^^^^^^^^
+   |             |
+   |             may need to be moved as well
    = note: this lint may become deny-by-default in the edition 2024 and higher, see the tracking issue <https://github.com/rust-lang/rust/issues/120363>
    = note: `#[warn(non_local_definitions)]` on by default
 
@@ -26,7 +28,9 @@ help: move this `impl` block outside of the current function `bad`
   --> $DIR/generics.rs:20:5
    |
 LL |     impl Uto7 for Test where Local: std::any::Any {}
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^-----^^^^^^^^^^^^^^^^^^
+   |                              |
+   |                              may need to be moved as well
    = note: this lint may become deny-by-default in the edition 2024 and higher, see the tracking issue <https://github.com/rust-lang/rust/issues/120363>
 
 warning: non-local `impl` definition, `impl` blocks should be written at the same level as their item

tests/ui/lint/non-local-defs/suggest-moving-inner.rs

@@ -7,7 +7,11 @@ fn main() {
         pub struct Type<T>(T);
     }
     struct InsideMain;
+    trait HasFoo {}
 
-    impl Trait<InsideMain> for &Vec<below::Type<InsideMain>> {}
+    impl<T> Trait<InsideMain> for &Vec<below::Type<(InsideMain, T)>>
     //~^ WARN non-local `impl` definition
+    where
+        T: HasFoo
+    {}
 }

tests/ui/lint/non-local-defs/suggest-moving-inner.stderr

@@ -1,20 +1,26 @@
 warning: non-local `impl` definition, `impl` blocks should be written at the same level as their item
-  --> $DIR/suggest-moving-inner.rs:11:5
+  --> $DIR/suggest-moving-inner.rs:12:5
    |
-LL |     impl Trait<InsideMain> for &Vec<below::Type<InsideMain>> {}
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL |     impl<T> Trait<InsideMain> for &Vec<below::Type<(InsideMain, T)>>
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: `impl` may be usable in bounds, etc. from outside the expression, which might e.g. make something constructible that previously wasn't, because it's still on a publicly-visible type
    = note: an `impl` is never scoped, even when it is nested inside an item, as it may impact type checking outside of that item, which can be the case if neither the trait or the self type are at the same nesting level as the `impl`
 help: move this `impl` block outside of the current function `main`
-  --> $DIR/suggest-moving-inner.rs:11:5
+  --> $DIR/suggest-moving-inner.rs:12:5
    |
-LL |     impl Trait<InsideMain> for &Vec<below::Type<InsideMain>> {}
-   |     ^^^^^^^^^^^----------^^^^^^^^^^^-----------^----------^^^^^
-   |                |                    |           |
-   |                |                    |           may need to be moved as well
-   |                |                    may need to be moved as well
-   |                may need to be moved as well
+LL |       impl<T> Trait<InsideMain> for &Vec<below::Type<(InsideMain, T)>>
+   |       ^             ----------           -----------  ---------- may need to be moved as well
+   |       |             |                    |
+   |       |             |                    may need to be moved as well
+   |  _____|             may need to be moved as well
+   | |
+LL | |
+LL | |     where
+LL | |         T: HasFoo
+   | |            ------ may need to be moved as well
+LL | |     {}
+   | |______^
    = note: this lint may become deny-by-default in the edition 2024 and higher, see the tracking issue <https://github.com/rust-lang/rust/issues/120363>
    = note: `#[warn(non_local_definitions)]` on by default