From f50394ee7dd3da55f1a434bfc88b5fa89cec9ef5 Mon Sep 17 00:00:00 2001 From: Jakob Hellermann Date: Fri, 28 Oct 2022 21:03:01 +0000 Subject: [PATCH] fix nightly clippy warnings (#6395) # Objective - fix new clippy lints before they get stable and break CI ## Solution - run `clippy --fix` to auto-fix machine-applicable lints - silence `clippy::should_implement_trait` for `fn HandleId::default` ## Changes - always prefer `format!("{inline}")` over `format!("{}", not_inline)` - prefer `Box::default` (or `Box::::default` if necessary) over `Box::new(T::default())` --- crates/bevy_asset/src/asset_server.rs | 5 +- crates/bevy_asset/src/handle.rs | 3 +- crates/bevy_ecs/examples/change_detection.rs | 10 +-- crates/bevy_ecs/examples/events.rs | 2 +- crates/bevy_ecs/examples/resources.rs | 2 +- crates/bevy_ecs/macros/src/fetch.rs | 18 +++-- crates/bevy_ecs/macros/src/lib.rs | 8 +-- crates/bevy_ecs/src/query/state.rs | 4 +- .../src/schedule/ambiguity_detection.rs | 2 +- .../src/schedule/executor_parallel.rs | 2 +- crates/bevy_ecs/src/schedule/mod.rs | 10 +-- crates/bevy_ecs/src/schedule/stage.rs | 69 ++++++++++--------- crates/bevy_ecs/src/system/mod.rs | 2 +- crates/bevy_ecs/src/world/mod.rs | 8 +-- crates/bevy_gltf/src/loader.rs | 6 +- crates/bevy_macro_utils/src/attrs.rs | 2 +- crates/bevy_pbr/src/light.rs | 3 +- crates/bevy_pbr/src/render/light.rs | 4 +- .../bevy_reflect_derive/src/documentation.rs | 2 +- .../bevy_reflect_derive/src/registration.rs | 2 +- .../bevy_reflect_derive/src/type_uuid.rs | 2 +- .../bevy_reflect_derive/src/utility.rs | 2 +- crates/bevy_reflect/examples/reflect_docs.rs | 4 +- crates/bevy_reflect/src/enums/enum_trait.rs | 2 +- crates/bevy_reflect/src/lib.rs | 4 +- crates/bevy_reflect/src/serde/de.rs | 4 +- crates/bevy_reflect/src/std_traits.rs | 2 +- crates/bevy_reflect/src/utility.rs | 3 +- .../bevy_render/src/mesh/mesh/conversions.rs | 2 +- crates/bevy_render/src/mesh/mesh/mod.rs | 6 +- crates/bevy_render/src/render_graph/graph.rs | 4 +- .../bevy_render/src/render_graph/node_slot.rs | 4 +- .../src/render_phase/draw_state.rs | 4 +- .../bevy_render/src/render_resource/shader.rs | 2 +- crates/bevy_render/src/renderer/mod.rs | 2 +- crates/bevy_render/src/texture/image.rs | 8 +-- crates/bevy_render/src/texture/ktx2.rs | 7 +- crates/bevy_scene/src/serde.rs | 6 +- crates/bevy_sprite/src/render/mod.rs | 2 +- crates/bevy_tasks/src/task_pool.rs | 4 +- crates/bevy_text/src/glyph_brush.rs | 2 +- crates/bevy_text/src/text2d.rs | 4 +- crates/bevy_ui/src/render/mod.rs | 2 +- crates/bevy_ui/src/widget/text.rs | 2 +- crates/bevy_winit/src/converters.rs | 2 +- examples/ecs/custom_query_param.rs | 8 +-- examples/ecs/ecs_guide.rs | 2 +- examples/ecs/state.rs | 2 +- examples/ecs/system_closure.rs | 2 +- examples/ecs/system_piping.rs | 4 +- examples/scene/scene.rs | 2 +- examples/stress_tests/bevymark.rs | 8 +-- examples/stress_tests/many_foxes.rs | 2 +- examples/stress_tests/many_lights.rs | 2 +- examples/stress_tests/transform_hierarchy.rs | 4 +- examples/tools/gamepad_viewer.rs | 6 +- examples/ui/text_debug.rs | 4 +- tools/build-example-pages/src/main.rs | 2 +- tools/build-wasm-example/src/main.rs | 4 +- tools/spancmp/src/main.rs | 6 +- tools/spancmp/src/pretty.rs | 2 +- 61 files changed, 153 insertions(+), 157 deletions(-) diff --git a/crates/bevy_asset/src/asset_server.rs b/crates/bevy_asset/src/asset_server.rs index 217ef50898d0d..97c3ede26e623 100644 --- a/crates/bevy_asset/src/asset_server.rs +++ b/crates/bevy_asset/src/asset_server.rs @@ -147,10 +147,7 @@ impl AssetServer { .server .asset_lifecycles .write() - .insert( - T::TYPE_UUID, - Box::new(AssetLifecycleChannel::::default()), - ) + .insert(T::TYPE_UUID, Box::>::default()) .is_some() { panic!("Error while registering new asset type: {:?} with UUID: {:?}. Another type with the same UUID is already registered. Can not register new asset type with the same UUID", diff --git a/crates/bevy_asset/src/handle.rs b/crates/bevy_asset/src/handle.rs index 006d11504b690..1ef5116d4342e 100644 --- a/crates/bevy_asset/src/handle.rs +++ b/crates/bevy_asset/src/handle.rs @@ -62,6 +62,7 @@ impl HandleId { /// Creates the default id for an asset of type `T`. #[inline] + #[allow(clippy::should_implement_trait)] // `Default` is not implemented for `HandleId`, the default value depends on the asset type pub fn default() -> Self { HandleId::Id(T::TYPE_UUID, 0) } @@ -294,7 +295,7 @@ impl Default for Handle { impl Debug for Handle { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error> { let name = std::any::type_name::().split("::").last().unwrap(); - write!(f, "{:?}Handle<{}>({:?})", self.handle_type, name, self.id) + write!(f, "{:?}Handle<{name}>({:?})", self.handle_type, self.id) } } diff --git a/crates/bevy_ecs/examples/change_detection.rs b/crates/bevy_ecs/examples/change_detection.rs index d2f86c0fc18e5..0578c601f09e3 100644 --- a/crates/bevy_ecs/examples/change_detection.rs +++ b/crates/bevy_ecs/examples/change_detection.rs @@ -36,7 +36,7 @@ fn main() { // Simulate 10 frames in our world for iteration in 1..=10 { - println!("Simulating frame {}/10", iteration); + println!("Simulating frame {iteration}/10"); schedule.run(&mut world); } } @@ -66,7 +66,7 @@ enum SimulationSystem { fn spawn_entities(mut commands: Commands, mut entity_counter: ResMut) { if rand::thread_rng().gen_bool(0.6) { let entity_id = commands.spawn(Age::default()).id(); - println!(" spawning {:?}", entity_id); + println!(" spawning {entity_id:?}"); entity_counter.value += 1; } } @@ -82,10 +82,10 @@ fn print_changed_entities( entity_with_mutated_component: Query<(Entity, &Age), Changed>, ) { for entity in &entity_with_added_component { - println!(" {:?} has it's first birthday!", entity); + println!(" {entity:?} has it's first birthday!"); } for (entity, value) in &entity_with_mutated_component { - println!(" {:?} is now {:?} frames old", entity, value); + println!(" {entity:?} is now {value:?} frames old"); } } @@ -100,7 +100,7 @@ fn age_all_entities(mut entities: Query<&mut Age>) { fn remove_old_entities(mut commands: Commands, entities: Query<(Entity, &Age)>) { for (entity, age) in &entities { if age.frames > 2 { - println!(" despawning {:?} due to age > 2", entity); + println!(" despawning {entity:?} due to age > 2"); commands.entity(entity).despawn(); } } diff --git a/crates/bevy_ecs/examples/events.rs b/crates/bevy_ecs/examples/events.rs index 45410653a64eb..b14a209823d60 100644 --- a/crates/bevy_ecs/examples/events.rs +++ b/crates/bevy_ecs/examples/events.rs @@ -35,7 +35,7 @@ fn main() { // Simulate 10 frames of our world for iteration in 1..=10 { - println!("Simulating frame {}/10", iteration); + println!("Simulating frame {iteration}/10"); schedule.run(&mut world); } } diff --git a/crates/bevy_ecs/examples/resources.rs b/crates/bevy_ecs/examples/resources.rs index 9f764a1d20a96..d4874e98ff6c8 100644 --- a/crates/bevy_ecs/examples/resources.rs +++ b/crates/bevy_ecs/examples/resources.rs @@ -27,7 +27,7 @@ fn main() { schedule.add_stage(Update, update); for iteration in 1..=10 { - println!("Simulating frame {}/10", iteration); + println!("Simulating frame {iteration}/10"); schedule.run(&mut world); } } diff --git a/crates/bevy_ecs/macros/src/fetch.rs b/crates/bevy_ecs/macros/src/fetch.rs index 002a1605bd9f8..8d2c48bf4104b 100644 --- a/crates/bevy_ecs/macros/src/fetch.rs +++ b/crates/bevy_ecs/macros/src/fetch.rs @@ -76,7 +76,7 @@ pub fn derive_world_query_impl(ast: DeriveInput) -> TokenStream { } Ok(()) }) - .unwrap_or_else(|_| panic!("Invalid `{}` attribute format", WORLD_QUERY_ATTRIBUTE_NAME)); + .unwrap_or_else(|_| panic!("Invalid `{WORLD_QUERY_ATTRIBUTE_NAME}` attribute format")); } let path = bevy_ecs_path(); @@ -93,26 +93,26 @@ pub fn derive_world_query_impl(ast: DeriveInput) -> TokenStream { let struct_name = ast.ident.clone(); let read_only_struct_name = if fetch_struct_attributes.is_mutable { - Ident::new(&format!("{}ReadOnly", struct_name), Span::call_site()) + Ident::new(&format!("{struct_name}ReadOnly"), Span::call_site()) } else { struct_name.clone() }; - let item_struct_name = Ident::new(&format!("{}Item", struct_name), Span::call_site()); + let item_struct_name = Ident::new(&format!("{struct_name}Item"), Span::call_site()); let read_only_item_struct_name = if fetch_struct_attributes.is_mutable { - Ident::new(&format!("{}ReadOnlyItem", struct_name), Span::call_site()) + Ident::new(&format!("{struct_name}ReadOnlyItem"), Span::call_site()) } else { item_struct_name.clone() }; - let fetch_struct_name = Ident::new(&format!("{}Fetch", struct_name), Span::call_site()); + let fetch_struct_name = Ident::new(&format!("{struct_name}Fetch"), Span::call_site()); let read_only_fetch_struct_name = if fetch_struct_attributes.is_mutable { - Ident::new(&format!("{}ReadOnlyFetch", struct_name), Span::call_site()) + Ident::new(&format!("{struct_name}ReadOnlyFetch"), Span::call_site()) } else { fetch_struct_name.clone() }; - let state_struct_name = Ident::new(&format!("{}State", struct_name), Span::call_site()); + let state_struct_name = Ident::new(&format!("{struct_name}State"), Span::call_site()); let fields = match &ast.data { Data::Struct(DataStruct { @@ -438,9 +438,7 @@ fn read_world_query_field_info(field: &Field) -> WorldQueryFieldInfo { } Ok(()) }) - .unwrap_or_else(|_| { - panic!("Invalid `{}` attribute format", WORLD_QUERY_ATTRIBUTE_NAME) - }); + .unwrap_or_else(|_| panic!("Invalid `{WORLD_QUERY_ATTRIBUTE_NAME}` attribute format")); is_ignored }); diff --git a/crates/bevy_ecs/macros/src/lib.rs b/crates/bevy_ecs/macros/src/lib.rs index 2a52620ed099e..f67e58cf19be6 100644 --- a/crates/bevy_ecs/macros/src/lib.rs +++ b/crates/bevy_ecs/macros/src/lib.rs @@ -208,12 +208,12 @@ fn get_idents(fmt_string: fn(usize) -> String, count: usize) -> Vec { pub fn impl_param_set(_input: TokenStream) -> TokenStream { let mut tokens = TokenStream::new(); let max_params = 8; - let params = get_idents(|i| format!("P{}", i), max_params); - let params_fetch = get_idents(|i| format!("PF{}", i), max_params); - let metas = get_idents(|i| format!("m{}", i), max_params); + let params = get_idents(|i| format!("P{i}"), max_params); + let params_fetch = get_idents(|i| format!("PF{i}"), max_params); + let metas = get_idents(|i| format!("m{i}"), max_params); let mut param_fn_muts = Vec::new(); for (i, param) in params.iter().enumerate() { - let fn_name = Ident::new(&format!("p{}", i), Span::call_site()); + let fn_name = Ident::new(&format!("p{i}"), Span::call_site()); let index = Index::from(i); param_fn_muts.push(quote! { pub fn #fn_name<'a>(&'a mut self) -> <#param::Fetch as SystemParamFetch<'a, 'a>>::Item { diff --git a/crates/bevy_ecs/src/query/state.rs b/crates/bevy_ecs/src/query/state.rs index 7bbbe3dad266c..3a22ccb328de9 100644 --- a/crates/bevy_ecs/src/query/state.rs +++ b/crates/bevy_ecs/src/query/state.rs @@ -1400,9 +1400,9 @@ impl std::error::Error for QuerySingleError {} impl std::fmt::Display for QuerySingleError { fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - QuerySingleError::NoEntities(query) => write!(f, "No entities fit the query {}", query), + QuerySingleError::NoEntities(query) => write!(f, "No entities fit the query {query}"), QuerySingleError::MultipleEntities(query) => { - write!(f, "Multiple entities fit the query {}!", query) + write!(f, "Multiple entities fit the query {query}!") } } } diff --git a/crates/bevy_ecs/src/schedule/ambiguity_detection.rs b/crates/bevy_ecs/src/schedule/ambiguity_detection.rs index 001f39530b7d3..6bd61f469ece0 100644 --- a/crates/bevy_ecs/src/schedule/ambiguity_detection.rs +++ b/crates/bevy_ecs/src/schedule/ambiguity_detection.rs @@ -101,7 +101,7 @@ impl SystemStage { last_segment_kind = Some(segment); } - writeln!(string, " -- {:?} and {:?}", system_a, system_b).unwrap(); + writeln!(string, " -- {system_a:?} and {system_b:?}").unwrap(); if !conflicts.is_empty() { writeln!(string, " conflicts: {conflicts:?}").unwrap(); diff --git a/crates/bevy_ecs/src/schedule/executor_parallel.rs b/crates/bevy_ecs/src/schedule/executor_parallel.rs index 09e8f07301170..68dd1f1ea798d 100644 --- a/crates/bevy_ecs/src/schedule/executor_parallel.rs +++ b/crates/bevy_ecs/src/schedule/executor_parallel.rs @@ -558,7 +558,7 @@ mod tests { StartedSystems(1), ] ); - stage.set_executor(Box::new(SingleThreadedExecutor::default())); + stage.set_executor(Box::::default()); stage.run(&mut world); } } diff --git a/crates/bevy_ecs/src/schedule/mod.rs b/crates/bevy_ecs/src/schedule/mod.rs index 8f0e6edf2c906..222339606fec3 100644 --- a/crates/bevy_ecs/src/schedule/mod.rs +++ b/crates/bevy_ecs/src/schedule/mod.rs @@ -117,7 +117,7 @@ impl Schedule { let label = label.as_label(); self.stage_order.push(label); let prev = self.stages.insert(label, Box::new(stage)); - assert!(prev.is_none(), "Stage already exists: {:?}.", label); + assert!(prev.is_none(), "Stage already exists: {label:?}."); self } @@ -152,11 +152,11 @@ impl Schedule { .enumerate() .find(|(_i, stage_label)| **stage_label == target) .map(|(i, _)| i) - .unwrap_or_else(|| panic!("Target stage does not exist: {:?}.", target)); + .unwrap_or_else(|| panic!("Target stage does not exist: {target:?}.")); self.stage_order.insert(target_index + 1, label); let prev = self.stages.insert(label, Box::new(stage)); - assert!(prev.is_none(), "Stage already exists: {:?}.", label); + assert!(prev.is_none(), "Stage already exists: {label:?}."); self } @@ -192,11 +192,11 @@ impl Schedule { .enumerate() .find(|(_i, stage_label)| **stage_label == target) .map(|(i, _)| i) - .unwrap_or_else(|| panic!("Target stage does not exist: {:?}.", target)); + .unwrap_or_else(|| panic!("Target stage does not exist: {target:?}.")); self.stage_order.insert(target_index, label); let prev = self.stages.insert(label, Box::new(stage)); - assert!(prev.is_none(), "Stage already exists: {:?}.", label); + assert!(prev.is_none(), "Stage already exists: {label:?}."); self } diff --git a/crates/bevy_ecs/src/schedule/stage.rs b/crates/bevy_ecs/src/schedule/stage.rs index bb14e63e05057..6dc6ff3de485c 100644 --- a/crates/bevy_ecs/src/schedule/stage.rs +++ b/crates/bevy_ecs/src/schedule/stage.rs @@ -29,9 +29,9 @@ pub trait Stage: Downcast + Send + Sync { impl Debug for dyn Stage { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { if let Some(as_systemstage) = self.as_any().downcast_ref::() { - write!(f, "{:?}", as_systemstage) + write!(f, "{as_systemstage:?}") } else if let Some(as_schedule) = self.as_any().downcast_ref::() { - write!(f, "{:?}", as_schedule) + write!(f, "{as_schedule:?}") } else { write!(f, "Unknown dyn Stage") } @@ -132,11 +132,11 @@ impl SystemStage { } pub fn single_threaded() -> Self { - Self::new(Box::new(SingleThreadedExecutor::default())) + Self::new(Box::::default()) } pub fn parallel() -> Self { - Self::new(Box::new(ParallelExecutor::default())) + Self::new(Box::::default()) } pub fn get_executor(&self) -> Option<&T> { @@ -455,7 +455,7 @@ impl SystemStage { Ok(output) => output, Err(DependencyGraphError::GraphCycles(cycle)) => { use std::fmt::Write; - let mut message = format!("Found a dependency cycle in {}:", nodes_description); + let mut message = format!("Found a dependency cycle in {nodes_description}:"); writeln!(message).unwrap(); for (index, labels) in &cycle { writeln!(message, " - {}", nodes[*index].name()).unwrap(); @@ -604,15 +604,15 @@ impl SystemStage { v: &Vec, f: &mut std::fmt::Formatter<'_>, ) -> std::fmt::Result { - write!(f, "{}: ", name)?; + write!(f, "{name}: ")?; if v.len() > 1 { writeln!(f, "[")?; for sc in v.iter() { - writeln!(f, "{:?},", sc)?; + writeln!(f, "{sc:?},")?; } write!(f, "], ") } else { - write!(f, "{:?}, ", v) + write!(f, "{v:?}, ") } } } @@ -671,7 +671,7 @@ fn process_systems( if let Some(index) = container.run_criteria_label().map(|label| { *run_criteria_labels .get(label) - .unwrap_or_else(|| panic!("No run criteria with label {:?} found.", label)) + .unwrap_or_else(|| panic!("No run criteria with label {label:?} found.")) }) { container.set_run_criteria(index); } @@ -961,7 +961,7 @@ mod tests { .with_system(make_exclusive(3).at_end()); stage.run(&mut world); assert_eq!(world.resource_mut::().0, vec![0, 1, 2, 3]); - stage.set_executor(Box::new(SingleThreadedExecutor::default())); + stage.set_executor(Box::::default()); stage.run(&mut world); assert_eq!( world.resource::().0, @@ -976,7 +976,7 @@ mod tests { .with_system(make_exclusive(0).at_start()); stage.run(&mut world); assert_eq!(world.resource::().0, vec![0, 1, 2, 3]); - stage.set_executor(Box::new(SingleThreadedExecutor::default())); + stage.set_executor(Box::::default()); stage.run(&mut world); assert_eq!( world.resource::().0, @@ -991,7 +991,7 @@ mod tests { .with_system(make_parallel(0).at_start()); stage.run(&mut world); assert_eq!(world.resource::().0, vec![0, 1, 2, 3]); - stage.set_executor(Box::new(SingleThreadedExecutor::default())); + stage.set_executor(Box::::default()); stage.run(&mut world); assert_eq!( world.resource::().0, @@ -1021,7 +1021,7 @@ mod tests { .with_system(make_exclusive(2).after(L1)) .with_system(make_exclusive(0).label(L0)); stage.run(&mut world); - stage.set_executor(Box::new(SingleThreadedExecutor::default())); + stage.set_executor(Box::::default()); stage.run(&mut world); assert_eq!(world.resource::().0, vec![0, 1, 2, 0, 1, 2]); } @@ -1035,7 +1035,7 @@ mod tests { .with_system(make_exclusive(2).label(L2)) .with_system(make_exclusive(0).before(L1)); stage.run(&mut world); - stage.set_executor(Box::new(SingleThreadedExecutor::default())); + stage.set_executor(Box::::default()); stage.run(&mut world); assert_eq!(world.resource::().0, vec![0, 1, 2, 0, 1, 2]); } @@ -1051,7 +1051,7 @@ mod tests { .with_system(make_exclusive(4).label(L4)) .with_system(make_exclusive(3).after(L2).before(L4)); stage.run(&mut world); - stage.set_executor(Box::new(SingleThreadedExecutor::default())); + stage.set_executor(Box::::default()); stage.run(&mut world); assert_eq!( world.resource::().0, @@ -1068,7 +1068,7 @@ mod tests { .with_system(make_exclusive(2).after(First)) .with_system(make_exclusive(0).label(First).label(L0)); stage.run(&mut world); - stage.set_executor(Box::new(SingleThreadedExecutor::default())); + stage.set_executor(Box::::default()); stage.run(&mut world); assert_eq!(world.resource::().0, vec![0, 1, 2, 0, 1, 2]); @@ -1080,7 +1080,7 @@ mod tests { .with_system(make_exclusive(4).label(L4)) .with_system(make_exclusive(3).after(L2).before(L4)); stage.run(&mut world); - stage.set_executor(Box::new(SingleThreadedExecutor::default())); + stage.set_executor(Box::::default()); stage.run(&mut world); assert_eq!( world.resource::().0, @@ -1095,7 +1095,7 @@ mod tests { .with_system(make_exclusive(4).label(L234).label(L4)) .with_system(make_exclusive(3).label(L234).after(L2).before(L4)); stage.run(&mut world); - stage.set_executor(Box::new(SingleThreadedExecutor::default())); + stage.set_executor(Box::::default()); stage.run(&mut world); assert_eq!( world.resource::().0, @@ -1114,7 +1114,7 @@ mod tests { .with_system(make_exclusive(4).label(L4).after(L3)) .with_system(make_exclusive(3).label(L3).after(L2).before(L4)); stage.run(&mut world); - stage.set_executor(Box::new(SingleThreadedExecutor::default())); + stage.set_executor(Box::::default()); stage.run(&mut world); assert_eq!( world.resource::().0, @@ -1136,7 +1136,7 @@ mod tests { ) .with_system(make_exclusive(1).after(L0).before(L2)); stage.run(&mut world); - stage.set_executor(Box::new(SingleThreadedExecutor::default())); + stage.set_executor(Box::::default()); stage.run(&mut world); assert_eq!( world.resource::().0, @@ -1158,7 +1158,7 @@ mod tests { .with_system(make_exclusive(2).after(L1)); stage.run(&mut world); stage.run(&mut world); - stage.set_executor(Box::new(SingleThreadedExecutor::default())); + stage.set_executor(Box::::default()); stage.run(&mut world); stage.run(&mut world); assert_eq!( @@ -1208,7 +1208,7 @@ mod tests { .with_system(make_parallel(2).after(L1)) .with_system(make_parallel(0).label(L0)); stage.run(&mut world); - stage.set_executor(Box::new(SingleThreadedExecutor::default())); + stage.set_executor(Box::::default()); stage.run(&mut world); assert_eq!(world.resource::().0, vec![0, 1, 2, 0, 1, 2]); } @@ -1222,7 +1222,7 @@ mod tests { .with_system(make_parallel(2).label(L2)) .with_system(make_parallel(0).before(L1)); stage.run(&mut world); - stage.set_executor(Box::new(SingleThreadedExecutor::default())); + stage.set_executor(Box::::default()); stage.run(&mut world); assert_eq!(world.resource::().0, vec![0, 1, 2, 0, 1, 2]); } @@ -1238,7 +1238,7 @@ mod tests { .with_system(make_parallel(4).label(L4)) .with_system(make_parallel(3).after(L2).before(L4)); stage.run(&mut world); - stage.set_executor(Box::new(SingleThreadedExecutor::default())); + stage.set_executor(Box::::default()); stage.run(&mut world); assert_eq!( world.resource::().0, @@ -1255,7 +1255,7 @@ mod tests { .with_system(make_parallel(2).after(First)) .with_system(make_parallel(0).label(First).label(L0)); stage.run(&mut world); - stage.set_executor(Box::new(SingleThreadedExecutor::default())); + stage.set_executor(Box::::default()); stage.run(&mut world); assert_eq!(world.resource::().0, vec![0, 1, 2, 0, 1, 2]); @@ -1267,7 +1267,7 @@ mod tests { .with_system(make_parallel(4).label(L4)) .with_system(make_parallel(3).after(L2).before(L4)); stage.run(&mut world); - stage.set_executor(Box::new(SingleThreadedExecutor::default())); + stage.set_executor(Box::::default()); stage.run(&mut world); assert_eq!( world.resource::().0, @@ -1282,7 +1282,7 @@ mod tests { .with_system(make_parallel(4).label(L234).label(L4)) .with_system(make_parallel(3).label(L234).after(L2).before(L4)); stage.run(&mut world); - stage.set_executor(Box::new(SingleThreadedExecutor::default())); + stage.set_executor(Box::::default()); stage.run(&mut world); assert_eq!( world.resource::().0, @@ -1304,7 +1304,7 @@ mod tests { for container in &stage.parallel { assert!(container.dependencies().len() <= 1); } - stage.set_executor(Box::new(SingleThreadedExecutor::default())); + stage.set_executor(Box::::default()); stage.run(&mut world); assert_eq!( world.resource::().0, @@ -1326,7 +1326,7 @@ mod tests { ) .with_system(make_parallel(1).after(L0).before(L2)); stage.run(&mut world); - stage.set_executor(Box::new(SingleThreadedExecutor::default())); + stage.set_executor(Box::::default()); stage.run(&mut world); assert_eq!( world.resource::().0, @@ -1351,7 +1351,7 @@ mod tests { .with_system(make_parallel(1).after(L0)); stage.run(&mut world); stage.run(&mut world); - stage.set_executor(Box::new(SingleThreadedExecutor::default())); + stage.set_executor(Box::::default()); stage.run(&mut world); stage.run(&mut world); assert_eq!(world.resource::().0, vec![0, 1, 1, 0, 1, 1]); @@ -1367,7 +1367,7 @@ mod tests { .with_system(make_parallel(2).after(L1)); stage.run(&mut world); stage.run(&mut world); - stage.set_executor(Box::new(SingleThreadedExecutor::default())); + stage.set_executor(Box::::default()); stage.run(&mut world); stage.run(&mut world); assert_eq!( @@ -1390,7 +1390,7 @@ mod tests { .with_system(make_parallel(3).after(L2)); stage.run(&mut world); stage.run(&mut world); - stage.set_executor(Box::new(SingleThreadedExecutor::default())); + stage.set_executor(Box::::default()); stage.run(&mut world); stage.run(&mut world); assert_eq!( @@ -1436,7 +1436,7 @@ mod tests { for _ in 0..4 { stage.run(&mut world); } - stage.set_executor(Box::new(SingleThreadedExecutor::default())); + stage.set_executor(Box::::default()); for _ in 0..5 { stage.run(&mut world); } @@ -1464,7 +1464,8 @@ mod tests { .with_system(make_parallel(3).after(L2)); stage.run(&mut world); stage.run(&mut world); - stage.set_executor(Box::new(SingleThreadedExecutor::default())); + // false positive, `Box::default` cannot coerce `SingleThreadedExecutor` to `dyn ParallelSystemExectutor` + stage.set_executor(Box::::default()); stage.run(&mut world); stage.run(&mut world); assert_eq!( diff --git a/crates/bevy_ecs/src/system/mod.rs b/crates/bevy_ecs/src/system/mod.rs index 2243636e3182f..36837802c8ea8 100644 --- a/crates/bevy_ecs/src/system/mod.rs +++ b/crates/bevy_ecs/src/system/mod.rs @@ -151,7 +151,7 @@ mod tests { fn simple_system() { fn sys(query: Query<&A>) { for a in &query { - println!("{:?}", a); + println!("{a:?}"); } } diff --git a/crates/bevy_ecs/src/world/mod.rs b/crates/bevy_ecs/src/world/mod.rs index c184615317063..eab6c01a051d0 100644 --- a/crates/bevy_ecs/src/world/mod.rs +++ b/crates/bevy_ecs/src/world/mod.rs @@ -219,7 +219,7 @@ impl World { pub fn entity(&self, entity: Entity) -> EntityRef { // Lazily evaluate panic!() via unwrap_or_else() to avoid allocation unless failure self.get_entity(entity) - .unwrap_or_else(|| panic!("Entity {:?} does not exist", entity)) + .unwrap_or_else(|| panic!("Entity {entity:?} does not exist")) } /// Retrieves an [`EntityMut`] that exposes read and write operations for the given `entity`. @@ -245,7 +245,7 @@ impl World { pub fn entity_mut(&mut self, entity: Entity) -> EntityMut { // Lazily evaluate panic!() via unwrap_or_else() to avoid allocation unless failure self.get_entity_mut(entity) - .unwrap_or_else(|| panic!("Entity {:?} does not exist", entity)) + .unwrap_or_else(|| panic!("Entity {entity:?} does not exist")) } /// Returns the components of an [`Entity`](crate::entity::Entity) through [`ComponentInfo`](crate::component::ComponentInfo). @@ -254,7 +254,7 @@ impl World { let entity_location = self .entities() .get(entity) - .unwrap_or_else(|| panic!("Entity {:?} does not exist", entity)); + .unwrap_or_else(|| panic!("Entity {entity:?} does not exist")); let archetype = self .archetypes() @@ -1634,7 +1634,7 @@ mod tests { should_panic: bool, id: u8, ) -> Self { - println!("creating component with id {}", id); + println!("creating component with id {id}"); drop_log.lock().unwrap().push(DropLogItem::Create(id)); Self { diff --git a/crates/bevy_gltf/src/loader.rs b/crates/bevy_gltf/src/loader.rs index e0f0e836aebd1..5459c37d5dd9a 100644 --- a/crates/bevy_gltf/src/loader.rs +++ b/crates/bevy_gltf/src/loader.rs @@ -578,8 +578,8 @@ async fn load_texture<'a>( let is_srgb = !linear_textures.contains(&gltf_texture.index()); let mut texture = match gltf_texture.source().source() { gltf::image::Source::View { view, mime_type } => { - let start = view.offset() as usize; - let end = (view.offset() + view.length()) as usize; + let start = view.offset(); + let end = view.offset() + view.length(); let buffer = &buffer_data[view.buffer().index()][start..end]; Image::from_buffer( buffer, @@ -920,7 +920,7 @@ fn primitive_label(mesh: &gltf::Mesh, primitive: &Primitive) -> String { /// Returns the label for the `material`. fn material_label(material: &gltf::Material) -> String { if let Some(index) = material.index() { - format!("Material{}", index) + format!("Material{index}") } else { "MaterialDefault".to_string() } diff --git a/crates/bevy_macro_utils/src/attrs.rs b/crates/bevy_macro_utils/src/attrs.rs index 4f2ed491e7e0d..34acff08f1e16 100644 --- a/crates/bevy_macro_utils/src/attrs.rs +++ b/crates/bevy_macro_utils/src/attrs.rs @@ -10,7 +10,7 @@ pub fn parse_attrs(ast: &DeriveInput, attr_name: Symbol) -> syn::Result { return Err(syn::Error::new_spanned( other, - format!("expected #[{}(...)]", attr_name), + format!("expected #[{attr_name}(...)]"), )) } } diff --git a/crates/bevy_pbr/src/light.rs b/crates/bevy_pbr/src/light.rs index 83b27cfdc27b8..f7358d77c031a 100644 --- a/crates/bevy_pbr/src/light.rs +++ b/crates/bevy_pbr/src/light.rs @@ -1031,8 +1031,7 @@ pub(crate) fn assign_lights_to_clusters( // this not not guaranteed to be small enough due to overlapped tiles, but // the conservative estimate is more than sufficient to cover the // difference - let index_ratio = - ViewClusterBindings::MAX_INDICES as f32 / cluster_index_estimate as f32; + let index_ratio = ViewClusterBindings::MAX_INDICES as f32 / cluster_index_estimate; let xy_ratio = index_ratio.sqrt(); requested_cluster_dimensions.x = diff --git a/crates/bevy_pbr/src/render/light.rs b/crates/bevy_pbr/src/render/light.rs index b82f4030e886c..7e9da57876154 100644 --- a/crates/bevy_pbr/src/render/light.rs +++ b/crates/bevy_pbr/src/render/light.rs @@ -1076,7 +1076,7 @@ pub fn prepare_lights( .spawn(( ShadowView { depth_texture_view, - pass_name: format!("shadow pass spot light {}", light_index,), + pass_name: format!("shadow pass spot light {light_index}",), }, ExtractedView { viewport: UVec4::new( @@ -1160,7 +1160,7 @@ pub fn prepare_lights( .spawn(( ShadowView { depth_texture_view, - pass_name: format!("shadow pass directional light {}", i), + pass_name: format!("shadow pass directional light {i}"), }, ExtractedView { viewport: UVec4::new( diff --git a/crates/bevy_reflect/bevy_reflect_derive/src/documentation.rs b/crates/bevy_reflect/bevy_reflect_derive/src/documentation.rs index 1ce2c2efb712a..46f58cb0f3237 100644 --- a/crates/bevy_reflect/bevy_reflect_derive/src/documentation.rs +++ b/crates/bevy_reflect/bevy_reflect_derive/src/documentation.rs @@ -51,7 +51,7 @@ impl Documentation { .enumerate() .map(|(index, doc)| { if index < len - 1 { - format!("{}\n", doc) + format!("{doc}\n") } else { doc.to_owned() } diff --git a/crates/bevy_reflect/bevy_reflect_derive/src/registration.rs b/crates/bevy_reflect/bevy_reflect_derive/src/registration.rs index 0f234105452fe..bf05718c67d0b 100644 --- a/crates/bevy_reflect/bevy_reflect_derive/src/registration.rs +++ b/crates/bevy_reflect/bevy_reflect_derive/src/registration.rs @@ -15,7 +15,7 @@ pub(crate) fn impl_get_type_registration( ) -> proc_macro2::TokenStream { let (impl_generics, ty_generics, where_clause) = generics.split_for_impl(); let serialization_data = serialization_denylist.map(|denylist| { - let denylist = denylist.into_iter().map(|v| v as usize); + let denylist = denylist.into_iter(); quote! { let ignored_indices = [#(#denylist),*].into_iter(); registration.insert::<#bevy_reflect_path::serde::SerializationData>(#bevy_reflect_path::serde::SerializationData::new(ignored_indices)); diff --git a/crates/bevy_reflect/bevy_reflect_derive/src/type_uuid.rs b/crates/bevy_reflect/bevy_reflect_derive/src/type_uuid.rs index a8017dc30e51f..1a1485dd0796e 100644 --- a/crates/bevy_reflect/bevy_reflect_derive/src/type_uuid.rs +++ b/crates/bevy_reflect/bevy_reflect_derive/src/type_uuid.rs @@ -55,7 +55,7 @@ pub(crate) fn type_uuid_derive(input: proc_macro::TokenStream) -> proc_macro::To let bytes = uuid .as_bytes() .iter() - .map(|byte| format!("{:#X}", byte)) + .map(|byte| format!("{byte:#X}")) .map(|byte_str| syn::parse_str::(&byte_str).unwrap()); let base = quote! { #bevy_reflect_path::Uuid::from_bytes([#( #bytes ),*]) }; diff --git a/crates/bevy_reflect/bevy_reflect_derive/src/utility.rs b/crates/bevy_reflect/bevy_reflect_derive/src/utility.rs index 8b28e4924597d..d9e44754c9f54 100644 --- a/crates/bevy_reflect/bevy_reflect_derive/src/utility.rs +++ b/crates/bevy_reflect/bevy_reflect_derive/src/utility.rs @@ -20,7 +20,7 @@ pub(crate) fn get_bevy_reflect_path() -> Path { /// assert_eq!("ReflectHash", reflected.to_string()); /// ``` pub(crate) fn get_reflect_ident(name: &str) -> Ident { - let reflected = format!("Reflect{}", name); + let reflected = format!("Reflect{name}"); Ident::new(&reflected, Span::call_site()) } diff --git a/crates/bevy_reflect/examples/reflect_docs.rs b/crates/bevy_reflect/examples/reflect_docs.rs index 62a3882f97baf..10852185c00d8 100644 --- a/crates/bevy_reflect/examples/reflect_docs.rs +++ b/crates/bevy_reflect/examples/reflect_docs.rs @@ -37,14 +37,14 @@ fn main() { // From here, we already have access to the struct's docs: let player_docs = player_info.docs().unwrap(); assert_eq!(" The struct that defines our player.\n\n # Example\n\n ```\n let player = Player::new(\"Urist McPlayer\");\n ```", player_docs); - println!("=====[ Player ]=====\n{}", player_docs); + println!("=====[ Player ]=====\n{player_docs}"); // We can then iterate through our struct's fields to get their documentation as well: if let TypeInfo::Struct(struct_info) = player_info { for field in struct_info.iter() { let field_name = field.name(); let field_docs = field.docs().unwrap_or(""); - println!("-----[ Player::{} ]-----\n{}", field_name, field_docs); + println!("-----[ Player::{field_name} ]-----\n{field_docs}"); } } } diff --git a/crates/bevy_reflect/src/enums/enum_trait.rs b/crates/bevy_reflect/src/enums/enum_trait.rs index 799f44d4bee96..16aeb88a84e2b 100644 --- a/crates/bevy_reflect/src/enums/enum_trait.rs +++ b/crates/bevy_reflect/src/enums/enum_trait.rs @@ -194,7 +194,7 @@ impl EnumInfo { /// /// This does _not_ check if the given variant exists. pub fn variant_path(&self, name: &str) -> String { - format!("{}::{}", self.type_name(), name) + format!("{}::{name}", self.type_name()) } /// Checks if a variant with the given name exists within this enum. diff --git a/crates/bevy_reflect/src/lib.rs b/crates/bevy_reflect/src/lib.rs index 4c09c173326db..24c84009a41f1 100644 --- a/crates/bevy_reflect/src/lib.rs +++ b/crates/bevy_reflect/src/lib.rs @@ -1099,7 +1099,7 @@ bevy_reflect::tests::should_reflect_debug::Test { custom: Cool debug!, }"#; - assert_eq!(expected, format!("\n{:#?}", reflected)); + assert_eq!(expected, format!("\n{reflected:#?}")); } #[test] @@ -1171,7 +1171,7 @@ bevy_reflect::tests::should_reflect_debug::Test { ), }"#; - assert_eq!(expected, format!("\n{}", output)); + assert_eq!(expected, format!("\n{output}")); } #[test] diff --git a/crates/bevy_reflect/src/serde/de.rs b/crates/bevy_reflect/src/serde/de.rs index d0f03d0f8631b..103fb1fc426f3 100644 --- a/crates/bevy_reflect/src/serde/de.rs +++ b/crates/bevy_reflect/src/serde/de.rs @@ -105,7 +105,7 @@ impl Debug for ExpectedValues { fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result { let len = self.0.len(); for (index, item) in self.0.iter().enumerate() { - write!(f, "`{}`", item)?; + write!(f, "`{item}`")?; if index < len - 1 { write!(f, ", ")?; } @@ -218,7 +218,7 @@ impl<'a, 'de> Visitor<'de> for UntypedReflectDeserializerVisitor<'a> { .ok_or_else(|| Error::invalid_length(0, &"at least one entry"))?; let registration = self.registry.get_with_name(&type_name).ok_or_else(|| { - Error::custom(format_args!("No registration found for `{}`", type_name)) + Error::custom(format_args!("No registration found for `{type_name}`")) })?; let value = map.next_value_seed(TypedReflectDeserializer { registration, diff --git a/crates/bevy_reflect/src/std_traits.rs b/crates/bevy_reflect/src/std_traits.rs index 2470e17fb9362..2f9b84735e758 100644 --- a/crates/bevy_reflect/src/std_traits.rs +++ b/crates/bevy_reflect/src/std_traits.rs @@ -17,7 +17,7 @@ impl ReflectDefault { impl FromType for ReflectDefault { fn from_type() -> Self { ReflectDefault { - default: || Box::new(T::default()), + default: || Box::::default(), } } } diff --git a/crates/bevy_reflect/src/utility.rs b/crates/bevy_reflect/src/utility.rs index 1c331978f3f78..84973cea15b90 100644 --- a/crates/bevy_reflect/src/utility.rs +++ b/crates/bevy_reflect/src/utility.rs @@ -128,7 +128,8 @@ impl GenericTypeInfoCell { F: FnOnce() -> TypeInfo, { let type_id = TypeId::of::(); - let mapping = self.0.get_or_init(|| Box::new(RwLock::default())); + // let mapping = self.0.get_or_init(|| Box::new(RwLock::default())); + let mapping = self.0.get_or_init(Box::default); if let Some(info) = mapping.read().get(&type_id) { return info; } diff --git a/crates/bevy_render/src/mesh/mesh/conversions.rs b/crates/bevy_render/src/mesh/mesh/conversions.rs index 9ebaa06541659..b8cbc173859d3 100644 --- a/crates/bevy_render/src/mesh/mesh/conversions.rs +++ b/crates/bevy_render/src/mesh/mesh/conversions.rs @@ -525,7 +525,7 @@ mod tests { error.to_string(), "cannot convert VertexAttributeValues::Uint32x4 to alloc::vec::Vec" ); - assert_eq!(format!("{:?}", error), + assert_eq!(format!("{error:?}"), "FromVertexAttributeError { from: Uint32x4([[0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0]]), variant: \"Uint32x4\", into: \"alloc::vec::Vec\" }"); } } diff --git a/crates/bevy_render/src/mesh/mesh/mod.rs b/crates/bevy_render/src/mesh/mesh/mod.rs index 15d1a9fb0fa1a..d58c5e2cf703d 100644 --- a/crates/bevy_render/src/mesh/mesh/mod.rs +++ b/crates/bevy_render/src/mesh/mesh/mod.rs @@ -114,8 +114,8 @@ impl Mesh { let values_format = VertexFormat::from(&values); if values_format != attribute.format { panic!( - "Failed to insert attribute. Invalid attribute format for {}. Given format is {:?} but expected {:?}", - attribute.name, values_format, attribute.format + "Failed to insert attribute. Invalid attribute format for {}. Given format is {values_format:?} but expected {:?}", + attribute.name, attribute.format ); } @@ -240,7 +240,7 @@ impl Mesh { let attribute_len = attribute_data.values.len(); if let Some(previous_vertex_count) = vertex_count { assert_eq!(previous_vertex_count, attribute_len, - "{:?} has a different vertex count ({}) than other attributes ({}) in this mesh.", attribute_id, attribute_len, previous_vertex_count); + "{attribute_id:?} has a different vertex count ({attribute_len}) than other attributes ({previous_vertex_count}) in this mesh."); } vertex_count = Some(attribute_len); } diff --git a/crates/bevy_render/src/render_graph/graph.rs b/crates/bevy_render/src/render_graph/graph.rs index 39d76120a4aa9..9471635a32e9a 100644 --- a/crates/bevy_render/src/render_graph/graph.rs +++ b/crates/bevy_render/src/render_graph/graph.rs @@ -579,10 +579,10 @@ mod tests { pub fn new(inputs: usize, outputs: usize) -> Self { TestNode { inputs: (0..inputs) - .map(|i| SlotInfo::new(format!("in_{}", i), SlotType::TextureView)) + .map(|i| SlotInfo::new(format!("in_{i}"), SlotType::TextureView)) .collect(), outputs: (0..outputs) - .map(|i| SlotInfo::new(format!("out_{}", i), SlotType::TextureView)) + .map(|i| SlotInfo::new(format!("out_{i}"), SlotType::TextureView)) .collect(), } } diff --git a/crates/bevy_render/src/render_graph/node_slot.rs b/crates/bevy_render/src/render_graph/node_slot.rs index fa8aa70e31dbd..5f04794b5e353 100644 --- a/crates/bevy_render/src/render_graph/node_slot.rs +++ b/crates/bevy_render/src/render_graph/node_slot.rs @@ -172,14 +172,14 @@ impl SlotInfos { /// Retrieves the [`SlotInfo`] for the provided label. pub fn get_slot(&self, label: impl Into) -> Option<&SlotInfo> { let label = label.into(); - let index = self.get_slot_index(&label)?; + let index = self.get_slot_index(label)?; self.slots.get(index) } /// Retrieves the [`SlotInfo`] for the provided label mutably. pub fn get_slot_mut(&mut self, label: impl Into) -> Option<&mut SlotInfo> { let label = label.into(); - let index = self.get_slot_index(&label)?; + let index = self.get_slot_index(label)?; self.slots.get_mut(index) } diff --git a/crates/bevy_render/src/render_phase/draw_state.rs b/crates/bevy_render/src/render_phase/draw_state.rs index a709c078f921d..ac38b26afda94 100644 --- a/crates/bevy_render/src/render_phase/draw_state.rs +++ b/crates/bevy_render/src/render_phase/draw_state.rs @@ -127,7 +127,7 @@ impl<'a> TrackedRenderPass<'a> { ) { if self .state - .is_bind_group_set(index as usize, bind_group.id(), dynamic_uniform_indices) + .is_bind_group_set(index, bind_group.id(), dynamic_uniform_indices) { trace!( "set bind_group {} (already set): {:?} ({:?})", @@ -147,7 +147,7 @@ impl<'a> TrackedRenderPass<'a> { self.pass .set_bind_group(index as u32, bind_group, dynamic_uniform_indices); self.state - .set_bind_group(index as usize, bind_group.id(), dynamic_uniform_indices); + .set_bind_group(index, bind_group.id(), dynamic_uniform_indices); } /// Assign a vertex buffer to a slot. diff --git a/crates/bevy_render/src/render_resource/shader.rs b/crates/bevy_render/src/render_resource/shader.rs index beee76e6f25a5..b216c445588e2 100644 --- a/crates/bevy_render/src/render_resource/shader.rs +++ b/crates/bevy_render/src/render_resource/shader.rs @@ -258,7 +258,7 @@ impl AssetLoader for ShaderLoader { String::from_utf8(Vec::from(bytes))?, naga::ShaderStage::Compute, ), - _ => panic!("unhandled extension: {}", ext), + _ => panic!("unhandled extension: {ext}"), }; let shader_imports = SHADER_IMPORT_PROCESSOR.get_imports(&shader); diff --git a/crates/bevy_render/src/renderer/mod.rs b/crates/bevy_render/src/renderer/mod.rs index 74f4dfb9dfcac..3d74ecce4c2b2 100644 --- a/crates/bevy_render/src/renderer/mod.rs +++ b/crates/bevy_render/src/renderer/mod.rs @@ -44,7 +44,7 @@ pub fn render_system(world: &mut World) { } } - panic!("Error running render graph: {}", e); + panic!("Error running render graph: {e}"); } { diff --git a/crates/bevy_render/src/texture/image.rs b/crates/bevy_render/src/texture/image.rs index 58de8eee4f86b..03077976bb6b4 100644 --- a/crates/bevy_render/src/texture/image.rs +++ b/crates/bevy_render/src/texture/image.rs @@ -170,7 +170,7 @@ pub struct DefaultImageSampler(pub(crate) Sampler); impl Default for Image { fn default() -> Self { let format = wgpu::TextureFormat::bevy_default(); - let data = vec![255; format.pixel_size() as usize]; + let data = vec![255; format.pixel_size()]; Image { data, texture_descriptor: wgpu::TextureDescriptor { @@ -367,9 +367,9 @@ impl Image { ktx2_buffer_to_image(buffer, supported_compressed_formats, is_srgb) } _ => { - let image_crate_format = format.as_image_crate_format().ok_or_else(|| { - TextureError::UnsupportedTextureFormat(format!("{:?}", format)) - })?; + let image_crate_format = format + .as_image_crate_format() + .ok_or_else(|| TextureError::UnsupportedTextureFormat(format!("{format:?}")))?; let mut reader = image::io::Reader::new(std::io::Cursor::new(buffer)); reader.set_format(image_crate_format); reader.no_limits(); diff --git a/crates/bevy_render/src/texture/ktx2.rs b/crates/bevy_render/src/texture/ktx2.rs index 75d61e3a9eda0..17cb8b435c423 100644 --- a/crates/bevy_render/src/texture/ktx2.rs +++ b/crates/bevy_render/src/texture/ktx2.rs @@ -24,9 +24,8 @@ pub fn ktx2_buffer_to_image( supported_compressed_formats: CompressedImageFormats, is_srgb: bool, ) -> Result { - let ktx2 = ktx2::Reader::new(buffer).map_err(|err| { - TextureError::InvalidData(format!("Failed to parse ktx2 file: {:?}", err)) - })?; + let ktx2 = ktx2::Reader::new(buffer) + .map_err(|err| TextureError::InvalidData(format!("Failed to parse ktx2 file: {err:?}")))?; let Header { pixel_width: width, pixel_height: height, @@ -367,7 +366,7 @@ pub fn ktx2_get_texture_format>( if data_format_descriptor.header == DataFormatDescriptorHeader::BASIC { let basic_data_format_descriptor = BasicDataFormatDescriptor::parse(data_format_descriptor.data) - .map_err(|err| TextureError::InvalidData(format!("KTX2: {:?}", err)))?; + .map_err(|err| TextureError::InvalidData(format!("KTX2: {err:?}")))?; let sample_information = basic_data_format_descriptor .sample_information() .collect::>(); diff --git a/crates/bevy_scene/src/serde.rs b/crates/bevy_scene/src/serde.rs index 3cae74c3c3bbf..a341f3b4224e8 100644 --- a/crates/bevy_scene/src/serde.rs +++ b/crates/bevy_scene/src/serde.rs @@ -104,7 +104,7 @@ impl<'a> Serialize for ComponentsSerializer<'a> { for component in self.components { state.serialize_entry( component.type_name(), - &TypedReflectSerializer::new(&**component, &*self.registry.read()), + &TypedReflectSerializer::new(&**component, &self.registry.read()), )?; } state.end() @@ -344,13 +344,13 @@ impl<'a, 'de> Visitor<'de> for ComponentVisitor<'a> { let mut components = Vec::new(); while let Some(key) = map.next_key::<&str>()? { if !added.insert(key) { - return Err(Error::custom(format!("duplicate component: `{}`", key))); + return Err(Error::custom(format!("duplicate component: `{key}`"))); } let registration = self .registry .get_with_name(key) - .ok_or_else(|| Error::custom(format!("no registration found for `{}`", key)))?; + .ok_or_else(|| Error::custom(format!("no registration found for `{key}`")))?; components.push( map.next_value_seed(TypedReflectDeserializer::new(registration, self.registry))?, ); diff --git a/crates/bevy_sprite/src/render/mod.rs b/crates/bevy_sprite/src/render/mod.rs index 25d25cd315eef..c7a49d358cadc 100644 --- a/crates/bevy_sprite/src/render/mod.rs +++ b/crates/bevy_sprite/src/render/mod.rs @@ -353,7 +353,7 @@ pub fn extract_sprites( continue; } if let Some(texture_atlas) = texture_atlases.get(texture_atlas_handle) { - let rect = Some(texture_atlas.textures[atlas_sprite.index as usize]); + let rect = Some(texture_atlas.textures[atlas_sprite.index]); extracted_sprites.sprites.push(ExtractedSprite { entity, color: atlas_sprite.color, diff --git a/crates/bevy_tasks/src/task_pool.rs b/crates/bevy_tasks/src/task_pool.rs index a33454758d95c..d15a9e6ff2a75 100644 --- a/crates/bevy_tasks/src/task_pool.rs +++ b/crates/bevy_tasks/src/task_pool.rs @@ -105,9 +105,9 @@ impl TaskPool { let shutdown_rx = shutdown_rx.clone(); let thread_name = if let Some(thread_name) = thread_name { - format!("{} ({})", thread_name, i) + format!("{thread_name} ({i})") } else { - format!("TaskPool ({})", i) + format!("TaskPool ({i})") }; let mut thread_builder = thread::Builder::new().name(thread_name); diff --git a/crates/bevy_text/src/glyph_brush.rs b/crates/bevy_text/src/glyph_brush.rs index b7ae83e52565a..80b47dd57c217 100644 --- a/crates/bevy_text/src/glyph_brush.rs +++ b/crates/bevy_text/src/glyph_brush.rs @@ -123,7 +123,7 @@ impl GlyphBrush { })?; let texture_atlas = texture_atlases.get(&atlas_info.texture_atlas).unwrap(); - let glyph_rect = texture_atlas.textures[atlas_info.glyph_index as usize]; + let glyph_rect = texture_atlas.textures[atlas_info.glyph_index]; let size = Vec2::new(glyph_rect.width(), glyph_rect.height()); let x = bounds.min.x + size.x / 2.0 - min_x; diff --git a/crates/bevy_text/src/text2d.rs b/crates/bevy_text/src/text2d.rs index f63a3def9aa88..43cafbffe8923 100644 --- a/crates/bevy_text/src/text2d.rs +++ b/crates/bevy_text/src/text2d.rs @@ -117,7 +117,7 @@ pub fn extract_text2d_sprite( .get(&text_glyph.atlas_info.texture_atlas) .unwrap(); let handle = atlas.texture.clone_weak(); - let index = text_glyph.atlas_info.glyph_index as usize; + let index = text_glyph.atlas_info.glyph_index; let rect = Some(atlas.textures[index]); let glyph_transform = Transform::from_translation( @@ -207,7 +207,7 @@ pub fn update_text2d_layout( } Err(e @ TextError::FailedToAddGlyph(_)) | Err(e @ TextError::ExceedMaxTextAtlases(_)) => { - panic!("Fatal error when processing text: {}.", e); + panic!("Fatal error when processing text: {e}."); } Ok(info) => { calculated_size.size = Vec2::new( diff --git a/crates/bevy_ui/src/render/mod.rs b/crates/bevy_ui/src/render/mod.rs index d2cd2d2ac2a1d..28301d5b9a16b 100644 --- a/crates/bevy_ui/src/render/mod.rs +++ b/crates/bevy_ui/src/render/mod.rs @@ -341,7 +341,7 @@ pub fn extract_text_uinodes( .get(&text_glyph.atlas_info.texture_atlas) .unwrap(); let texture = atlas.texture.clone_weak(); - let index = text_glyph.atlas_info.glyph_index as usize; + let index = text_glyph.atlas_info.glyph_index; let rect = atlas.textures[index]; let atlas_size = Some(atlas.size); diff --git a/crates/bevy_ui/src/widget/text.rs b/crates/bevy_ui/src/widget/text.rs index 37cd2340fe7c1..267a00cb56a31 100644 --- a/crates/bevy_ui/src/widget/text.rs +++ b/crates/bevy_ui/src/widget/text.rs @@ -135,7 +135,7 @@ pub fn text_system( } Err(e @ TextError::FailedToAddGlyph(_)) | Err(e @ TextError::ExceedMaxTextAtlases(_)) => { - panic!("Fatal error when processing text: {}.", e); + panic!("Fatal error when processing text: {e}."); } Ok(info) => { calculated_size.size = Size { diff --git a/crates/bevy_winit/src/converters.rs b/crates/bevy_winit/src/converters.rs index afa3a2930b4d7..1702d2db96af3 100644 --- a/crates/bevy_winit/src/converters.rs +++ b/crates/bevy_winit/src/converters.rs @@ -42,7 +42,7 @@ pub fn convert_touch_input( winit::event::TouchPhase::Ended => TouchPhase::Ended, winit::event::TouchPhase::Cancelled => TouchPhase::Cancelled, }, - position: Vec2::new(location.x as f32, location.y as f32), + position: Vec2::new(location.x, location.y), force: touch_input.force.map(|f| match f { winit::event::Force::Calibrated { force, diff --git a/examples/ecs/custom_query_param.rs b/examples/ecs/custom_query_param.rs index 96bca881b95af..e13e4695e7c53 100644 --- a/examples/ecs/custom_query_param.rs +++ b/examples/ecs/custom_query_param.rs @@ -170,10 +170,10 @@ fn print_components_tuple( ) { println!("Print components (tuple):"); for (entity, a, b, nested, (generic_c, generic_d)) in &query { - println!("Entity: {:?}", entity); - println!("A: {:?}", a); - println!("B: {:?}", b); + println!("Entity: {entity:?}"); + println!("A: {a:?}"); + println!("B: {b:?}"); println!("Nested: {:?} {:?}", nested.0, nested.1); - println!("Generic: {:?} {:?}", generic_c, generic_d); + println!("Generic: {generic_c:?} {generic_d:?}"); } } diff --git a/examples/ecs/ecs_guide.rs b/examples/ecs/ecs_guide.rs index a7e4f303feac3..0e64a9d56f1fe 100644 --- a/examples/ecs/ecs_guide.rs +++ b/examples/ecs/ecs_guide.rs @@ -131,7 +131,7 @@ fn game_over_system( mut app_exit_events: EventWriter, ) { if let Some(ref player) = game_state.winning_player { - println!("{} won the game!", player); + println!("{player} won the game!"); app_exit_events.send(AppExit); } else if game_state.current_round == game_rules.max_rounds { println!("Ran out of rounds. Nobody wins!"); diff --git a/examples/ecs/state.rs b/examples/ecs/state.rs index 37cfcece63150..253e252ae6b46 100644 --- a/examples/ecs/state.rs +++ b/examples/ecs/state.rs @@ -134,6 +134,6 @@ fn change_color(time: Res