Some more cleanups

Author: jbarnoud

godot-codegen/src/class_generator.rs

@@ -586,7 +586,7 @@ fn make_method_definition(
 
     let is_virtual = false;
     make_function_definition(
-        &method_name_str,
+        method_name_str,
         special_cases::is_private(class_name, &method.name),
         receiver,
         &method.arguments,
@@ -638,7 +638,7 @@ fn make_builtin_method_definition(
 
     let is_virtual = false;
     make_function_definition(
-        &method_name_str,
+        method_name_str,
         special_cases::is_private(class_name, &method.name),
         receiver,
         &method.arguments,
@@ -675,7 +675,7 @@ pub(crate) fn make_utility_function_definition(
 
     let is_virtual = false;
     make_function_definition(
-        &function_name_str,
+        function_name_str,
         false,
         TokenStream::new(),
         &function.arguments,
@@ -1009,14 +1009,10 @@ fn make_virtual_method(class_method: &ClassMethod, ctx: &mut Context) -> TokenSt
     // Virtual methods are never static.
     assert!(!class_method.is_static);
 
-    let (receiver, _) = make_receiver(
-        class_method.is_static,
-        class_method.is_const,
-        quote! { self.object_ptr },
-    );
+    let receiver = make_receiver_self_param(false, class_method.is_const);
 
     // make_return requests these token streams, but they won't be used for
-    // virtual method. We can provide empty streams.
+    // virtual methods. We can provide empty streams.
     let varcall_invocation = TokenStream::new();
     let ptrcall_invocation = TokenStream::new();
     let init_code = TokenStream::new();
@@ -1025,7 +1021,7 @@ fn make_virtual_method(class_method: &ClassMethod, ctx: &mut Context) -> TokenSt
     let is_virtual = true;
     let is_private = false;
     make_function_definition(
-        &method_name,
+        method_name,
         is_private,
         receiver,
         &class_method.arguments,