diff --git a/crates/bevy_derive/src/shader_defs.rs b/crates/bevy_derive/src/shader_defs.rs index 4596667b6a1a4..e9f91b6871fbb 100644 --- a/crates/bevy_derive/src/shader_defs.rs +++ b/crates/bevy_derive/src/shader_defs.rs @@ -31,7 +31,7 @@ pub fn derive_shader_defs(input: TokenStream) -> TokenStream { let struct_name_pascal_case = ast.ident.to_string().to_pascal_case(); let shader_defs = shader_def_idents .iter() - .map(|i| format!("{}_{}", struct_name_pascal_case, i.to_string()).to_uppercase()); + .map(|i| format!("{}_{}", struct_name_pascal_case, i).to_uppercase()); let shader_defs_len = shader_defs.len(); let shader_def_indices = 0..shader_defs_len; diff --git a/crates/bevy_diagnostic/src/log_diagnostics_plugin.rs b/crates/bevy_diagnostic/src/log_diagnostics_plugin.rs index e4054b20b9884..4eda407fab493 100644 --- a/crates/bevy_diagnostic/src/log_diagnostics_plugin.rs +++ b/crates/bevy_diagnostic/src/log_diagnostics_plugin.rs @@ -56,22 +56,24 @@ impl LogDiagnosticsPlugin { if let Some(average) = diagnostic.average() { info!( target: "bevy diagnostic", - "{:12} (avg {:>})", - diagnostic.name, // Suffix is only used for 's' as in seconds currently, - // so we reserve one column for it - format!("{:.6}{:1}", value, diagnostic.suffix), + // so we reserve one column for it; however, // Do not reserve one column for the suffix in the average // The ) hugging the value is more aesthetically pleasing - format!("{:.6}{:}", average, diagnostic.suffix), + "{name:11.6}{suffix:1} (avg {average:>.6}{suffix:})", + name = diagnostic.name, + value = value, + suffix = diagnostic.suffix, + average = average, name_width = crate::MAX_DIAGNOSTIC_NAME_WIDTH, ); } else { info!( target: "bevy diagnostic", - "{:}", - diagnostic.name, - format!("{:.6}{:}", value, diagnostic.suffix), + "{name:.6}{suffix:}", + name = diagnostic.name, + value = value, + suffix = diagnostic.suffix, name_width = crate::MAX_DIAGNOSTIC_NAME_WIDTH, ); } diff --git a/crates/bevy_ecs/src/schedule/mod.rs b/crates/bevy_ecs/src/schedule/mod.rs index f8d04a8cabb2d..4af63a220a8b3 100644 --- a/crates/bevy_ecs/src/schedule/mod.rs +++ b/crates/bevy_ecs/src/schedule/mod.rs @@ -334,8 +334,7 @@ impl Schedule { pub fn run_once(&mut self, world: &mut World) { for label in self.stage_order.iter() { #[cfg(feature = "trace")] - let stage_span = - bevy_utils::tracing::info_span!("stage", name = &format!("{:?}", label) as &str); + let stage_span = bevy_utils::tracing::info_span!("stage", name = ?label); #[cfg(feature = "trace")] let _stage_guard = stage_span.enter(); let stage = self.stages.get_mut(label).unwrap(); diff --git a/crates/bevy_reflect/src/reflect.rs b/crates/bevy_reflect/src/reflect.rs index df7749599ba2f..9b0dea4b09a39 100644 --- a/crates/bevy_reflect/src/reflect.rs +++ b/crates/bevy_reflect/src/reflect.rs @@ -49,7 +49,7 @@ pub unsafe trait Reflect: Any + Send + Sync { impl Debug for dyn Reflect { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - f.write_str(&format!("Reflect({})", self.type_name())) + write!(f, "Reflect({})", self.type_name()) } } diff --git a/crates/bevy_reflect/src/serde/de.rs b/crates/bevy_reflect/src/serde/de.rs index b7bf5ec9b4858..216b25e106f40 100644 --- a/crates/bevy_reflect/src/serde/de.rs +++ b/crates/bevy_reflect/src/serde/de.rs @@ -200,11 +200,14 @@ impl<'a, 'de> Visitor<'de> for ReflectVisitor<'a> { .ok_or_else(|| de::Error::missing_field(type_fields::TYPE))?; let registration = self.registry.get_with_name(&type_name).ok_or_else(|| { - de::Error::custom(format!("No registration found for {}", type_name)) + de::Error::custom(format_args!( + "No registration found for {}", + type_name + )) })?; let deserialize_reflect = registration.data::().ok_or_else(|| { - de::Error::custom(format!( + de::Error::custom(format_args!( "The TypeRegistration for {} doesn't have DeserializeReflect", type_name )) diff --git a/crates/bevy_reflect/src/serde/ser.rs b/crates/bevy_reflect/src/serde/ser.rs index a865bd13b438b..fc14f7097da2f 100644 --- a/crates/bevy_reflect/src/serde/ser.rs +++ b/crates/bevy_reflect/src/serde/ser.rs @@ -23,7 +23,7 @@ impl<'a> Serializable<'a> { fn get_serializable(reflect_value: &dyn Reflect) -> Result { reflect_value.serializable().ok_or_else(|| { - serde::ser::Error::custom(&format!( + serde::ser::Error::custom(format_args!( "Type '{}' does not support ReflectValue serialization", reflect_value.type_name() ))