Merge pull request #1618 from sdroege/callbacks-no-box-reference

Don't cast callbacks as `&Box<T>` but use `&T` instead to make clippy…
gtk-rs · Nov 15, 2024 · 63aaa63 · 63aaa63
2 parents a491943 + 3205306
commit 63aaa63
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/src/codegen/function_body_chunk.rs b/src/codegen/function_body_chunk.rs
@@ -183,6 +183,19 @@ impl Builder {
                                             .join(", ")
                                     ),
                                 ))
+                            } else if !calls
+                                .iter()
+                                .any(|c| c.scope.is_async() || c.scope.is_call())
+                            {
+                                let s = format!(
+                                    "&({})",
+                                    calls
+                                        .iter()
+                                        .map(|c| c.bound_name.to_string())
+                                        .collect::<Vec<_>>()
+                                        .join(", ")
+                                );
+                                Some((s.clone(), s))
                             } else {
                                 let s = format!(
                                     "Box_<({})>",
@@ -482,13 +495,7 @@ impl Builder {
                         },
                         func
                     ))),
-                    type_: Some(Box::new(Chunk::Custom(
-                        if !trampoline.scope.is_async() && !trampoline.scope.is_call() {
-                            format!("&{}", full_type.1)
-                        } else {
-                            full_type.1.clone()
-                        },
-                    ))),
+                    type_: Some(Box::new(Chunk::Custom(full_type.1.clone()))),
                 });
                 if trampoline.scope.is_async() {
                     body.push(Chunk::Custom(format!(