Also check Querys that are nested in Tuples

Author: MinerSebas

crates/bevy_lint/src/unnecessary_with.rs

@@ -49,16 +49,36 @@ impl<'hir> LateLintPass<'hir> for UnnecessaryWith {
         _: HirId,
     ) {
         for typ in decl.inputs {
-            if let TyKind::Path(QPath::Resolved(_, path)) = &typ.kind {
-                if bevy_helpers::path_matches_symbol_path(ctx, path, bevy_paths::QUERY) {
-                    check_for_unnecesarry_with(ctx, &typ);
-                }
+            recursively_search_type(ctx, typ, bevy_paths::QUERY, &check_for_unnecesarry_with);
+        }
+    }
+}
+
+fn recursively_search_type<'hir, T: Fn(&LateContext<'hir>, &'hir Ty<'hir>) -> ()>(
+    ctx: &LateContext<'hir>,
+    typ: &'hir Ty,
+    symbol_path: &[&str],
+    function: &T,
+) {
+    match &typ.kind {
+        TyKind::Path(QPath::Resolved(_, path)) => {
+            if bevy_helpers::path_matches_symbol_path(ctx, path, symbol_path) {
+                (function)(ctx, &typ)
+            }
+        }
+        TyKind::Tup(types) => {
+            for tup_typ in *types {
+                // Todo: Filter out Types that dont implement SystemParam
+                // -> Is it possible to go from rustc_hit::Ty to rustc_middle::Ty?
+                // Required for using clippy_utils::ty::implements_trait.
+                recursively_search_type(ctx, tup_typ, symbol_path, function);
             }
         }
+        _ => (),
     }
 }
 
-fn check_for_unnecesarry_with<'hir>(ctx: &LateContext<'hir>, query: &'hir Ty) {
+fn check_for_unnecesarry_with<'hir>(ctx: &LateContext<'hir>, query: &'hir Ty<'hir>) {
     if let Some((world, Some(filter))) = bevy_helpers::get_generics_of_query(ctx, query) {
         let mut required_types = Vec::new();
         let mut with_types = Vec::new();

crates/bevy_lint/ui/unnecessary_with.rs

@@ -79,3 +79,25 @@ fn test_query21(_query: Query<&A, (Or<(With<A>, With<B>)>, With<C>)>) {
 fn test_query22(_query: Query<&mut A, (Or<(With<A>, With<B>)>, With<C>)>) {
     test_query22.system();
 }
+
+fn test_query23(_query: (Query<&A, With<A>>,)) {
+    test_query23.system();
+}
+fn test_query24(_query: (((((((((Query<&A, With<A>>,),),),),),),),),)) {
+    test_query24.system();
+}
+fn test_query25(
+    _query: (
+        (),
+        (((
+            (),
+            (
+                ((((Query<&A, With<A>>,), ()),),),
+                (),
+                (Query<&A, With<A>>, ()),
+            ),
+        ),),),
+    ),
+) {
+    test_query25.system();
+}

crates/bevy_lint/ui/unnecessary_with.stderr

@@ -144,5 +144,29 @@ error: Unnecessary `With` Filter
 LL | fn test_query22(_query: Query<&mut A, (Or<(With<A>, With<B>)>, With<C>)>) {
    |                                            ^^^^^^^
 
-error: aborting due to 24 previous errors
+error: Unnecessary `With` Filter
+  --> $DIR/unnecessary_with.rs:83:36
+   |
+LL | fn test_query23(_query: (Query<&A, With<A>>,)) {
+   |                                    ^^^^^^^
+
+error: Unnecessary `With` Filter
+  --> $DIR/unnecessary_with.rs:86:44
+   |
+LL | fn test_query24(_query: (((((((((Query<&A, With<A>>,),),),),),),),),)) {
+   |                                            ^^^^^^^
+
+error: Unnecessary `With` Filter
+  --> $DIR/unnecessary_with.rs:95:31
+   |
+LL |                 ((((Query<&A, With<A>>,), ()),),),
+   |                               ^^^^^^^
+
+error: Unnecessary `With` Filter
+  --> $DIR/unnecessary_with.rs:97:28
+   |
+LL |                 (Query<&A, With<A>>, ()),
+   |                            ^^^^^^^
+
+error: aborting due to 28 previous errors