Allow nullable callbacks

[GuillaumeGomez]

An example of generation: gtk-rs/gio#230

Note that the gio PR needs #815

cc @EPashkin @sdroege

[EPashkin]

Why not &trampoline.bound_name, in this for?

[GuillaumeGomez]

I need to check if it's the same. Thanks for the lead!

[GuillaumeGomez]

I confirm, it's the same!

[GuillaumeGomez]

Actually only for trampoline. Destroy callbacks have this issue. We need to update their bounds.

[EPashkin]

"glib::Pid" can be added with this diff, but not sure that it best solution

+++ b/src/codegen/function_body_chunk.rs
@@ -1307,6 +1307,13 @@ fn add_chunk_for_type(
             )));
             true
         }
+        library::Type::Alias(_) if ty_name == "glib::Pid" => {
+            body.push(Chunk::Custom(format!(
+                "let {0} = glib::Pid({0});",
+                par.name
+            )));
+            true
+        },
         library::Type::Alias(ref x) => add_chunk_for_type(env, x.typ, par, body, ty_name, nullable),
         ref x =>

[GuillaumeGomez]

I don't want it like this. I'd prefer use a trait instead.

[EPashkin]

Agree, also this diff not fix generation of "glib::spawn_async"

[EPashkin]

Seems cargo fmt is needed

[GuillaumeGomez]

I need to update the PR in any case.

[GuillaumeGomez]

Updated.

[EPashkin]

Not sure that it better than current version, Ex. in gdk.

+/src/auto/functions.rs
@@74,7 +574,7 @@ pub fn threads_add_idle_full<P: Fn() -> bool + Send + Sync + 'static>(
unsafe extern "C" fn notify_func<P: Fn() -> bool + Send + Sync + 'static>(
        data: glib_sys::gpointer,
    ) {
-        let _callback: Box_<P> = Box_::from_raw(data as *mut _);
+        let _callback: Box_<Fn() + 'static> = Box_::from_raw(data as *mut _);
    }
    let destroy_call3 = Some(notify_func::<P> as _);
    let super_callback0: Box_<P> = function_data;
@@ -630,7 +630,7 @@ pub fn threads_add_timeout_full<P: Fn() -> bool + Send + Sync + 'static>(
    unsafe extern "C" fn notify_func<P: Fn() -> bool + Send + Sync + 'static>(
        data: glib_sys::gpointer,
    ) {
-        let _callback: Box_<P> = Box_::from_raw(data as *mut _);
+        let _callback: Box_<Fn() + 'static> = Box_::from_raw(data as *mut _);
    }
    let destroy_call4 = Some(notify_func::<P> as _);
    let super_callback0: Box_<P> = function_data;
@@ -687,7 +687,7 @@ pub fn threads_add_timeout_seconds_full<P: Fn() -> bool + Send + Sync + 'static>
    unsafe extern "C" fn notify_func<P: Fn() -> bool + Send + Sync + 'static>(
        data: glib_sys::gpointer,
    ) {
-        let _callback: Box_<P> = Box_::from_raw(data as *mut _);
+        let _callback: Box_<Fn() + 'static> = Box_::from_raw(data as *mut _);

in gtk:

+++ b/src/auto/cell_layout.rs
@@ -159,9 +159,7 @@ impl<O: IsA<CellLayout>> CellLayoutExt for O {
             None
         };
         unsafe extern "C" fn destroy_func<P: IsA<CellRenderer>>(data: glib_sys::gpointer) {
-            let _callback: Box_<
-                Option<Box<dyn Fn(&CellLayout, &CellRenderer, &TreeModel, &TreeIter) + 'static>>,
-            > = Box_::from_raw(data as *mut _);
+            let _callback: Box_<Q> = Box_::from_raw(data as *mut _);
         }
         let destroy_call4 = Some(destroy_func::<P> as _);
         let super_callback0: Box_<

[sdroege]

Yes this does not look right. Will comment in more detail later. -- Sent from my Android device with K-9 Mail. Please excuse my brevity.

[sdroege]

+/src/auto/functions.rs
@@74,7 +574,7 @@ pub fn threads_add_idle_full<P: Fn() -> bool + Send + Sync + 'static>(
unsafe extern "C" fn notify_func<P: Fn() -> bool + Send + Sync + 'static>(
        data: glib_sys::gpointer,
    ) {
-        let _callback: Box_<P> = Box_::from_raw(data as *mut _);
+        let _callback: Box_<Fn() + 'static> = Box_::from_raw(data as *mut _);
    }

This changes things partially from static to dynamic dispatch, and will crash. We don't create a trait object, but the box is then interpreted as one here. And let's keep static dispatch please.

+++ b/src/auto/cell_layout.rs
@@ -159,9 +159,7 @@ impl<O: IsA<CellLayout>> CellLayoutExt for O {
             None
         };
         unsafe extern "C" fn destroy_func<P: IsA<CellRenderer>>(data: glib_sys::gpointer) {
-            let _callback: Box_<
-                Option<Box<dyn Fn(&CellLayout, &CellRenderer, &TreeModel, &TreeIter) + 'static>>,
-            > = Box_::from_raw(data as *mut _);
+            let _callback: Box_<Q> = Box_::from_raw(data as *mut _);
         }

This does the exact opposite. Created as trait object but then not interpreted as one.

Something's not right with this change :)

[GuillaumeGomez]

Indeed. It seems like I only made half the changes required...

[sdroege]

Indeed. It seems like I only made half the changes required...

It should not have any effect on already generated code though, so you also changed things that do not have to be changed :)

[GuillaumeGomez]

No, some changes had to be done, notably on the destructors. The current code couldn't handle more than one correctly.

[GuillaumeGomez]

Should be ready now. Updated the associated PR as well.

[EPashkin]

@GuillaumeGomez Thanks, I have only small nit

[sdroege]

See comment in the gio PR. Otherwise the generated code looks fine

[EPashkin]

@GuillaumeGomez Thanks, now wait for CI

[GuillaumeGomez]

CI is green! :)

[EPashkin]

@GuillaumeGomez Thanks again