Merge pull request #1206 from 0x53A/cargo-clippy-fix

Inline most string interpolations (`cargo +nightly clippy --fix --workspace`)

Author: Bromeon

godot-bindings/src/godot_version.rs

@@ -132,7 +132,7 @@ Current path: /Users/runner/work/gdext/gdext/godot-core
             custom_rev,
         };
         let parsed: GodotVersion = parse_godot_version(full).unwrap();
-        assert_eq!(parsed, expected, "{}", full);
+        assert_eq!(parsed, expected, "{full}");
     }
 
     for full in bad_versions {

godot-codegen/src/context.rs

@@ -247,7 +247,7 @@ impl<'a> Context<'a> {
         *self
             .method_table_indices
             .get(key)
-            .unwrap_or_else(|| panic!("did not register table index for key {:?}", key))
+            .unwrap_or_else(|| panic!("did not register table index for key {key:?}"))
     }
 
     /// Whether an interface trait is generated for a class.

godot-codegen/src/generator/builtins.rs

@@ -99,7 +99,7 @@ fn make_builtin_class(
         ty: outer_class, ..
     } = conv::to_rust_type(godot_name, None, ctx)
     else {
-        panic!("Rust type `{}` categorized wrong", godot_name)
+        panic!("Rust type `{godot_name}` categorized wrong")
     };
     let inner_class = class.inner_name();
 

godot-codegen/src/generator/default_parameters.rs

@@ -29,7 +29,7 @@ pub fn make_function_definition_with_defaults(
 
     let simple_fn_name = safe_ident(sig.name());
     let extended_fn_name = format_ident!("{}_ex", simple_fn_name);
-    let default_parameter_usage = format!("To set the default parameters, use [`Self::{}`] and its builder methods.  See [the book](https://godot-rust.github.io/book/godot-api/functions.html#default-parameters) for detailed usage instructions.", extended_fn_name);
+    let default_parameter_usage = format!("To set the default parameters, use [`Self::{extended_fn_name}`] and its builder methods.  See [the book](https://godot-rust.github.io/book/godot-api/functions.html#default-parameters) for detailed usage instructions.");
     let vis = functions_common::make_vis(sig.is_private());
 
     let (builder_doc, surround_class_prefix) = make_extender_doc(sig, &extended_fn_name);

godot-codegen/src/generator/docs.rs

@@ -71,7 +71,7 @@ pub fn make_class_doc(
     };
 
     let notes = special_cases::get_class_extra_docs(class_name)
-        .map(|notes| format!("# Specific notes for this class\n\n{}", notes))
+        .map(|notes| format!("# Specific notes for this class\n\n{notes}"))
         .unwrap_or_default();
 
     format!(
@@ -102,7 +102,7 @@ pub fn make_virtual_trait_doc(
     );
 
     let notes = special_cases::get_interface_extra_docs(trait_name_str)
-        .map(|notes| format!("# Specific notes for this interface\n\n{}", notes))
+        .map(|notes| format!("# Specific notes for this interface\n\n{notes}"))
         .unwrap_or_default();
 
     // Detect if a base interface exists. This is not the case if intermediate Godot classes are marked "abstract" (aka final for GDExtension).

godot-codegen/src/generator/extension_interface.rs

@@ -54,7 +54,7 @@ fn generate_proc_address_funcs(h_path: &Path) -> TokenStream {
             doc,
         } = fptr;
 
-        let name_str = Literal::byte_string(format!("{}\0", name).as_bytes());
+        let name_str = Literal::byte_string(format!("{name}\0").as_bytes());
 
         let decl = quote! {
             #[doc = #doc]

godot-codegen/src/generator/functions_common.rs

@@ -427,7 +427,7 @@ impl LifetimeGen {
 
         let mut tokens = quote! { < };
         for i in 0..self.count {
-            let lft = lifetime(&format!("a{}", i));
+            let lft = lifetime(&format!("a{i}"));
             tokens.extend(quote! { #lft, });
         }
         tokens.extend(quote! { > });

godot-codegen/src/generator/method_tables.rs

@@ -337,8 +337,7 @@ fn make_method_table(info: IndexedMethodTable) -> TokenStream {
         assert_eq!(
             last.method_inits.last().unwrap().index,
             method_count - 1,
-            "last method should have highest index (table {})",
-            table_name
+            "last method should have highest index (table {table_name})"
         );
     } else {
         assert_eq!(method_count, 0, "empty method table should have count 0");

godot-codegen/src/generator/native_structures.rs

@@ -244,7 +244,7 @@ fn make_native_structure_field_and_accessor(
 fn normalize_native_structure_field_type(field_type: &str) -> String {
     if field_type.contains("::") {
         let with_dot = field_type.replace("::", ".");
-        format!("enum::{}", with_dot)
+        format!("enum::{with_dot}")
     } else {
         field_type.to_string()
     }

godot-codegen/src/generator/signals.rs

@@ -308,7 +308,7 @@ impl SignalParams {
                 write!(formatted_types, ", ").unwrap();
             }
 
-            write!(formatted_types, "{}: {}", param_name, formatted_ty).unwrap();
+            write!(formatted_types, "{param_name}: {formatted_ty}").unwrap();
         }
 
         Self {