Use AsRefClosure when generating the bindings

This simplifies things significantly \o/
This commit is contained in:
2020-05-11 00:48:18 +01:00
parent ad0d95ab40
commit 9151f64a6d
126 changed files with 1633 additions and 1054 deletions

View File

@@ -1,4 +1,4 @@
// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Room.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_interface_room.rs`, see https://github.com/diwic/dbus-rs
// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Room.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_interface_room.rs`, see https://github.com/diwic/dbus-rs
use dbus;
use dbus::arg;
use dbus::tree;
@@ -20,8 +20,8 @@ where
D: tree::DataType,
D::Method: Default,
D::Property: Default,
T: ChannelInterfaceRoom2,
F: 'static + for<'z> Fn(&'z tree::MethodInfo<tree::MTFn<D>, D>) -> &'z T,
T: AsRef<dyn ChannelInterfaceRoom2>,
F: 'static + Fn(&tree::MethodInfo<tree::MTFn<D>, D>) -> T,
{
let i = factory.interface("org.freedesktop.Telepathy.Channel.Interface.Room2", data);
let f = ::std::sync::Arc::new(f);
@@ -30,7 +30,8 @@ where
let fclone = f.clone();
let p = p.on_get(move |a, pinfo| {
let minfo = pinfo.to_method_info();
let d = fclone(&minfo);
let dd = fclone(&minfo);
let d = dd.as_ref();
a.append(d.room_name()?);
Ok(())
});
@@ -41,7 +42,8 @@ where
let fclone = f.clone();
let p = p.on_get(move |a, pinfo| {
let minfo = pinfo.to_method_info();
let d = fclone(&minfo);
let dd = fclone(&minfo);
let d = dd.as_ref();
a.append(d.server()?);
Ok(())
});
@@ -52,7 +54,8 @@ where
let fclone = f.clone();
let p = p.on_get(move |a, pinfo| {
let minfo = pinfo.to_method_info();
let d = fclone(&minfo);
let dd = fclone(&minfo);
let d = dd.as_ref();
a.append(d.creator()?);
Ok(())
});
@@ -63,7 +66,8 @@ where
let fclone = f.clone();
let p = p.on_get(move |a, pinfo| {
let minfo = pinfo.to_method_info();
let d = fclone(&minfo);
let dd = fclone(&minfo);
let d = dd.as_ref();
a.append(d.creator_handle()?);
Ok(())
});
@@ -74,7 +78,8 @@ where
let fclone = f.clone();
let p = p.on_get(move |a, pinfo| {
let minfo = pinfo.to_method_info();
let d = fclone(&minfo);
let dd = fclone(&minfo);
let d = dd.as_ref();
a.append(d.creation_timestamp()?);
Ok(())
});