From 5f936b42b16a61eded68c622fcce29a5f6934078 Mon Sep 17 00:00:00 2001
From: ira <JustTheCoolDude@gmail.com>
Date: Thu, 1 Jun 2023 23:05:05 +0200
Subject: [PATCH] Resolve clippy issues for rust 1.70.0 (#8738)

- Supress false positive `redundant_clone` lints.
- Supress inactionable `result_large_err` lint.
Most of the size(50 out of 68 bytes) is coming from
`naga::WithSpan<naga::valid::ValidationError>`
---
 crates/bevy_ecs/macros/src/fetch.rs                        | 7 +++++--
 .../tests/ui/query_to_readonly.stderr                      | 2 +-
 crates/bevy_render/src/render_resource/pipeline_cache.rs   | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/crates/bevy_ecs/macros/src/fetch.rs b/crates/bevy_ecs/macros/src/fetch.rs
index 4e3dcb5feb..6383aa6fa3 100644
--- a/crates/bevy_ecs/macros/src/fetch.rs
+++ b/crates/bevy_ecs/macros/src/fetch.rs
@@ -88,17 +88,18 @@ pub fn derive_world_query_impl(input: TokenStream) -> TokenStream {
     let user_generics = ast.generics.clone();
     let (user_impl_generics, user_ty_generics, user_where_clauses) = user_generics.split_for_impl();
     let user_generics_with_world = {
-        let mut generics = ast.generics.clone();
+        let mut generics = ast.generics;
         generics.params.insert(0, parse_quote!('__w));
         generics
     };
     let (user_impl_generics_with_world, user_ty_generics_with_world, user_where_clauses_with_world) =
         user_generics_with_world.split_for_impl();
 
-    let struct_name = ast.ident.clone();
+    let struct_name = ast.ident;
     let read_only_struct_name = if fetch_struct_attributes.is_mutable {
         Ident::new(&format!("{struct_name}ReadOnly"), Span::call_site())
     } else {
+        #[allow(clippy::redundant_clone)]
         struct_name.clone()
     };
 
@@ -106,6 +107,7 @@ pub fn derive_world_query_impl(input: TokenStream) -> TokenStream {
     let read_only_item_struct_name = if fetch_struct_attributes.is_mutable {
         Ident::new(&format!("{struct_name}ReadOnlyItem"), Span::call_site())
     } else {
+        #[allow(clippy::redundant_clone)]
         item_struct_name.clone()
     };
 
@@ -115,6 +117,7 @@ pub fn derive_world_query_impl(input: TokenStream) -> TokenStream {
         let new_ident = Ident::new(&format!("{struct_name}ReadOnlyFetch"), Span::call_site());
         ensure_no_collision(new_ident, tokens.clone())
     } else {
+        #[allow(clippy::redundant_clone)]
         fetch_struct_name.clone()
     };
 
diff --git a/crates/bevy_ecs_compile_fail_tests/tests/ui/query_to_readonly.stderr b/crates/bevy_ecs_compile_fail_tests/tests/ui/query_to_readonly.stderr
index b571081822..4c56f0cde4 100644
--- a/crates/bevy_ecs_compile_fail_tests/tests/ui/query_to_readonly.stderr
+++ b/crates/bevy_ecs_compile_fail_tests/tests/ui/query_to_readonly.stderr
@@ -42,4 +42,4 @@ error[E0502]: cannot borrow `query` as mutable because it is also borrowed as im
    |                           ^^^^^^^^^^^^^^^^^^ mutable borrow occurs here
 56 |
 57 |         println!("{ref_foo:?}");
-   |                    ------- immutable borrow later used here
+   |                   ----------- immutable borrow later used here
diff --git a/crates/bevy_render/src/render_resource/pipeline_cache.rs b/crates/bevy_render/src/render_resource/pipeline_cache.rs
index 4cdc740c92..60fc733f19 100644
--- a/crates/bevy_render/src/render_resource/pipeline_cache.rs
+++ b/crates/bevy_render/src/render_resource/pipeline_cache.rs
@@ -162,6 +162,7 @@ impl ShaderDefVal {
 }
 
 impl ShaderCache {
+    #[allow(clippy::result_large_err)]
     fn get(
         &mut self,
         render_device: &RenderDevice,