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/Connection_Interface_Forwarding.xml -i org.freedesktop.Telepathy -o src/telepathy/connection_interface_forwarding.rs`, see https://github.com/diwic/dbus-rs
// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Forwarding.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/connection_interface_forwarding.rs`, see https://github.com/diwic/dbus-rs
use dbus;
use dbus::arg;
use dbus::tree;
@@ -27,8 +27,8 @@ where
D::Method: Default,
D::Property: Default,
D::Signal: Default,
T: ConnectionInterfaceForwardingDRAFT,
F: 'static + for<'z> Fn(&'z tree::MethodInfo<tree::MTFn<D>, D>) -> &'z T,
T: AsRef<dyn ConnectionInterfaceForwardingDRAFT>,
F: 'static + Fn(&tree::MethodInfo<tree::MTFn<D>, D>) -> T,
{
let i = factory.interface(
"org.freedesktop.Telepathy.Connection.Interface.Forwarding.DRAFT",
@@ -40,7 +40,8 @@ where
let mut i = minfo.msg.iter_init();
let condition: u32 = i.read()?;
let forwards: Vec<(u32, u32)> = i.read()?;
let d = fclone(minfo);
let dd = fclone(minfo);
let d = dd.as_ref();
let old_forwards = d.set_forwarding_rule(condition, forwards)?;
let rm = minfo.msg.method_return();
let rm = rm.append1(old_forwards);
@@ -60,7 +61,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.supported_forwarding_conditions()?);
Ok(())
});
@@ -74,7 +76,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.forwarding_rules()?);
Ok(())
});