Fix constructor generic args

- Add lifetime
- Update span

Author: BenFordTytherington

crates/cxx-qt-gen/src/generator/rust/constructor.rs

@@ -207,19 +207,25 @@ pub fn generate(
 
     let rust_struct_name_rust = qobject_names.rust_struct.rust_unqualified();
 
-    result
-        .cxx_qt_mod_contents
-        .append(&mut vec![parse_quote_spanned! {
-            qobject_name_rust.span() => // TODO! Improve this span
-            impl ::cxx_qt::ConstructorDeclared for #qobject_name_rust_qualified {}
-        }]);
-
     for (index, constructor) in constructors.iter().enumerate() {
+        let mut arguments = TokenStream::new();
+        for elem in &constructor.arguments {
+            arguments.extend(quote!(#elem,));
+        }
+
         let lifetime = constructor.lifetime.as_ref().map(|lifetime| {
             quote! {
                 < #lifetime >
             }
         });
+
+        result
+            .cxx_qt_mod_contents
+            .append(&mut vec![parse_quote_spanned! {
+            constructor.imp.span() => // TODO! Improve this span
+            impl #lifetime ::cxx_qt::ConstructorDeclared<(#arguments) > for #qobject_name_rust_qualified {}
+        }]);
+
         let arguments_lifetime =
             lifetime_of_arguments(&constructor.lifetime, &constructor.arguments)?;
         let base_lifetime =
@@ -610,7 +616,7 @@ mod tests {
         assert_tokens_eq(
             &blocks.cxx_qt_mod_contents[0],
             quote! {
-                impl ::cxx_qt::ConstructorDeclared for qobject::MyObject {}
+                impl ::cxx_qt::ConstructorDeclared<()> for qobject::MyObject {}
             },
         );
 
@@ -741,6 +747,13 @@ mod tests {
 
         assert_tokens_eq(
             &blocks.cxx_qt_mod_contents[4],
+            quote! {
+                impl<'lifetime> ::cxx_qt::ConstructorDeclared<(*const QObject,)> for qobject::MyObject {}
+            },
+        );
+
+        assert_tokens_eq(
+            &blocks.cxx_qt_mod_contents[5],
             quote! {
                 #[doc(hidden)]
                 pub fn route_arguments_MyObject_1<'lifetime>(arg0: *const QObject) -> qobject::CxxQtConstructorArgumentsMyObject1<'lifetime>
@@ -768,7 +781,7 @@ mod tests {
             },
         );
         assert_tokens_eq(
-            &blocks.cxx_qt_mod_contents[5],
+            &blocks.cxx_qt_mod_contents[6],
             quote! {
                 #[doc(hidden)]
                 #[allow(unused_variables)]
@@ -782,7 +795,7 @@ mod tests {
             },
         );
         assert_tokens_eq(
-            &blocks.cxx_qt_mod_contents[6],
+            &blocks.cxx_qt_mod_contents[7],
             quote! {
                 #[doc(hidden)]
                 #[allow(unused_variables)]
@@ -821,7 +834,7 @@ mod tests {
         ]);
 
         assert_eq!(blocks.cxx_mod_contents.len(), 10);
-        assert_eq!(blocks.cxx_qt_mod_contents.len(), 7);
+        assert_eq!(blocks.cxx_qt_mod_contents.len(), 8);
 
         let namespace_attr = quote! {
                 #[namespace = "qobject::cxx_qt_MyObject"]

crates/cxx-qt-gen/test_outputs/invokables.rs

@@ -334,7 +334,7 @@ unsafe impl ::cxx_qt::casting::Upcast<::cxx_qt::QObject> for ffi::MyObject {
         ffi::cxx_qt_ffi_MyObject_downcastPtr(base)
     }
 }
-impl ::cxx_qt::ConstructorDeclared for ffi::MyObject {}
+impl<'a> ::cxx_qt::ConstructorDeclared<(i32, &'a QString)> for ffi::MyObject {}
 #[doc(hidden)]
 pub fn route_arguments_MyObject_0<'a>(
     arg0: i32,
@@ -377,6 +377,7 @@ pub fn initialize_MyObject_0<'a>(
 ) {
     <ffi::MyObject as cxx_qt::Constructor<(i32, &'a ffi::QString)>>::initialize(qobject, ());
 }
+impl ::cxx_qt::ConstructorDeclared<()> for ffi::MyObject {}
 #[doc(hidden)]
 pub fn route_arguments_MyObject_1() -> ffi::CxxQtConstructorArgumentsMyObject1 {
     #[allow(unused_variables)]

crates/cxx-qt/src/lib.rs

@@ -217,7 +217,7 @@ pub trait Threading: Sized {
 }
 
 #[doc(hidden)]
-pub trait ConstructorDeclared {}
+pub trait ConstructorDeclared<Arguments> {}
 
 /// This trait can be implemented on any [CxxQtType] to define a
 /// custom constructor in C++ for the QObject.
@@ -310,7 +310,7 @@ pub trait ConstructorDeclared {}
 ///
 /// If a QObject implements the `Initialize` trait, and the inner Rust struct is [Default]-constructible it will automatically implement `cxx_qt::Constructor<()>`.
 /// Additionally, implementing `impl cxx_qt::Initialize` will act as shorthand for `cxx_qt::Constructor<()>`.
-pub trait Constructor<Arguments>: CxxQtType + ConstructorDeclared {
+pub trait Constructor<Arguments>: CxxQtType + ConstructorDeclared<Arguments> {
     /// The arguments that are passed to the [`new()`](Self::new) function to construct the inner Rust struct.
     /// This must be a tuple of CXX compatible types.
     ///
@@ -397,7 +397,7 @@ pub trait Constructor<Arguments>: CxxQtType + ConstructorDeclared {
 /// ```
 // TODO: Once the QObject type is available in the cxx-qt crate, also auto-generate a default
 // constructor that takes QObject and passes it to the parent.
-pub trait Initialize: CxxQtType + ConstructorDeclared {
+pub trait Initialize: CxxQtType + ConstructorDeclared<()> {
     /// This function is called to initialize the QObject after construction.
     fn initialize(self: core::pin::Pin<&mut Self>);
 }