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>`
This commit is contained in:
parent
70aee72726
commit
5f936b42b1
@ -88,17 +88,18 @@ pub fn derive_world_query_impl(input: TokenStream) -> TokenStream {
|
|||||||
let user_generics = ast.generics.clone();
|
let user_generics = ast.generics.clone();
|
||||||
let (user_impl_generics, user_ty_generics, user_where_clauses) = user_generics.split_for_impl();
|
let (user_impl_generics, user_ty_generics, user_where_clauses) = user_generics.split_for_impl();
|
||||||
let user_generics_with_world = {
|
let user_generics_with_world = {
|
||||||
let mut generics = ast.generics.clone();
|
let mut generics = ast.generics;
|
||||||
generics.params.insert(0, parse_quote!('__w));
|
generics.params.insert(0, parse_quote!('__w));
|
||||||
generics
|
generics
|
||||||
};
|
};
|
||||||
let (user_impl_generics_with_world, user_ty_generics_with_world, user_where_clauses_with_world) =
|
let (user_impl_generics_with_world, user_ty_generics_with_world, user_where_clauses_with_world) =
|
||||||
user_generics_with_world.split_for_impl();
|
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 {
|
let read_only_struct_name = if fetch_struct_attributes.is_mutable {
|
||||||
Ident::new(&format!("{struct_name}ReadOnly"), Span::call_site())
|
Ident::new(&format!("{struct_name}ReadOnly"), Span::call_site())
|
||||||
} else {
|
} else {
|
||||||
|
#[allow(clippy::redundant_clone)]
|
||||||
struct_name.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 {
|
let read_only_item_struct_name = if fetch_struct_attributes.is_mutable {
|
||||||
Ident::new(&format!("{struct_name}ReadOnlyItem"), Span::call_site())
|
Ident::new(&format!("{struct_name}ReadOnlyItem"), Span::call_site())
|
||||||
} else {
|
} else {
|
||||||
|
#[allow(clippy::redundant_clone)]
|
||||||
item_struct_name.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());
|
let new_ident = Ident::new(&format!("{struct_name}ReadOnlyFetch"), Span::call_site());
|
||||||
ensure_no_collision(new_ident, tokens.clone())
|
ensure_no_collision(new_ident, tokens.clone())
|
||||||
} else {
|
} else {
|
||||||
|
#[allow(clippy::redundant_clone)]
|
||||||
fetch_struct_name.clone()
|
fetch_struct_name.clone()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -42,4 +42,4 @@ error[E0502]: cannot borrow `query` as mutable because it is also borrowed as im
|
|||||||
| ^^^^^^^^^^^^^^^^^^ mutable borrow occurs here
|
| ^^^^^^^^^^^^^^^^^^ mutable borrow occurs here
|
||||||
56 |
|
56 |
|
||||||
57 | println!("{ref_foo:?}");
|
57 | println!("{ref_foo:?}");
|
||||||
| ------- immutable borrow later used here
|
| ----------- immutable borrow later used here
|
||||||
|
|||||||
@ -162,6 +162,7 @@ impl ShaderDefVal {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl ShaderCache {
|
impl ShaderCache {
|
||||||
|
#[allow(clippy::result_large_err)]
|
||||||
fn get(
|
fn get(
|
||||||
&mut self,
|
&mut self,
|
||||||
render_device: &RenderDevice,
|
render_device: &RenderDevice,
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user