From 9151f64a6d4a5b3f0c078fb4faa2ce1eb9425fb2 Mon Sep 17 00:00:00 2001 From: Nick Thomas Date: Mon, 11 May 2020 00:48:18 +0100 Subject: [PATCH] Use AsRefClosure when generating the bindings This simplifies things significantly \o/ --- scripts/dbus-codegen | 1 + src/main.rs | 40 +------ src/padfoot/connection.rs | 25 ++--- src/padfoot/connection_manager.rs | 46 +++----- src/padfoot/protocol.rs | 7 +- src/telepathy/account.rs | 105 ++++++++++++------ src/telepathy/account_interface_addressing.rs | 12 +- src/telepathy/account_interface_avatar.rs | 12 +- ...unt_interface_external_password_storage.rs | 12 +- src/telepathy/account_interface_hidden.rs | 9 +- src/telepathy/account_interface_storage.rs | 18 +-- src/telepathy/account_manager.rs | 21 ++-- .../account_manager_interface_hidden.rs | 12 +- src/telepathy/all.rs | 2 +- .../authentication_tls_certificate.rs | 24 ++-- src/telepathy/call_content.rs | 24 ++-- .../call_content_interface_audio_control.rs | 18 +-- src/telepathy/call_content_interface_dtmf.rs | 21 ++-- src/telepathy/call_content_interface_media.rs | 33 ++++-- .../call_content_interface_video_control.rs | 21 ++-- .../call_content_media_description.rs | 30 +++-- ...ription_interface_rtcp_extended_reports.rs | 27 +++-- ...dia_description_interface_rtcp_feedback.rs | 12 +- ...ription_interface_rtp_header_extensions.rs | 9 +- src/telepathy/call_interface_mute.rs | 12 +- src/telepathy/call_stream.rs | 27 +++-- src/telepathy/call_stream_endpoint.rs | 42 ++++--- src/telepathy/call_stream_interface_media.rs | 60 ++++++---- src/telepathy/channel.rs | 42 ++++--- src/telepathy/channel_bundle.rs | 9 +- src/telepathy/channel_dispatch_operation.rs | 30 +++-- src/telepathy/channel_dispatcher.rs | 30 +++-- .../channel_dispatcher_interface_messages1.rs | 9 +- ...nel_dispatcher_interface_operation_list.rs | 9 +- src/telepathy/channel_future.rs | 9 +- src/telepathy/channel_handler.rs | 9 +- src/telepathy/channel_interface_addressing.rs | 18 +-- src/telepathy/channel_interface_anonymity.rs | 15 ++- src/telepathy/channel_interface_call_state.rs | 9 +- ...hannel_interface_captcha_authentication.rs | 30 +++-- src/telepathy/channel_interface_chat_state.rs | 12 +- src/telepathy/channel_interface_conference.rs | 24 ++-- .../channel_interface_credentials_storage.rs | 9 +- .../channel_interface_destroyable.rs | 9 +- src/telepathy/channel_interface_dtmf.rs | 24 ++-- ...hannel_interface_file_transfer_metadata.rs | 18 +-- src/telepathy/channel_interface_group.rs | 60 ++++++---- src/telepathy/channel_interface_hold.rs | 12 +- src/telepathy/channel_interface_html.rs | 6 +- .../channel_interface_media_signalling.rs | 9 +- .../channel_interface_mergeable_conference.rs | 9 +- src/telepathy/channel_interface_messages.rs | 27 +++-- src/telepathy/channel_interface_password.rs | 12 +- src/telepathy/channel_interface_picture.rs | 48 +++++--- src/telepathy/channel_interface_room.rs | 21 ++-- .../channel_interface_room_config.rs | 51 ++++++--- .../channel_interface_sasl_authentication.rs | 51 ++++++--- src/telepathy/channel_interface_securable.rs | 12 +- .../channel_interface_service_point.rs | 12 +- src/telepathy/channel_interface_sms.rs | 15 ++- src/telepathy/channel_interface_splittable.rs | 9 +- src/telepathy/channel_interface_subject.rs | 24 ++-- src/telepathy/channel_interface_transfer.rs | 9 +- src/telepathy/channel_interface_tube.rs | 12 +- src/telepathy/channel_request.rs | 30 +++-- src/telepathy/channel_type_call.rs | 63 +++++++---- src/telepathy/channel_type_contact_list.rs | 6 +- src/telepathy/channel_type_contact_search.rs | 27 +++-- src/telepathy/channel_type_dbus_tube.rs | 21 ++-- src/telepathy/channel_type_file_transfer.rs | 54 +++++---- src/telepathy/channel_type_room_list.rs | 18 +-- .../channel_type_server_authentication.rs | 9 +- .../channel_type_server_tls_connection.rs | 15 ++- src/telepathy/channel_type_stream_tube.rs | 18 +-- src/telepathy/channel_type_streamed_media.rs | 27 +++-- src/telepathy/channel_type_text.rs | 18 +-- src/telepathy/channel_type_tubes.rs | 39 ++++--- src/telepathy/client.rs | 9 +- src/telepathy/client_approver.rs | 12 +- src/telepathy/client_handler.rs | 21 ++-- src/telepathy/client_handler_future.rs | 12 +- src/telepathy/client_interface_requests.rs | 12 +- src/telepathy/client_observer.rs | 18 +-- src/telepathy/connection.rs | 63 +++++++---- .../connection_interface_addressing.rs | 12 +- .../connection_interface_aliasing.rs | 18 +-- .../connection_interface_anonymity.rs | 21 ++-- src/telepathy/connection_interface_avatars.rs | 51 ++++++--- src/telepathy/connection_interface_balance.rs | 12 +- .../connection_interface_capabilities.rs | 12 +- .../connection_interface_cellular.rs | 39 ++++--- .../connection_interface_client_types.rs | 12 +- ...nnection_interface_communication_policy.rs | 15 ++- .../connection_interface_contact_blocking.rs | 18 +-- ...nnection_interface_contact_capabilities.rs | 12 +- .../connection_interface_contact_groups.rs | 33 ++++-- .../connection_interface_contact_info.rs | 24 ++-- .../connection_interface_contact_list.rs | 42 ++++--- .../connection_interface_contacts.rs | 15 ++- .../connection_interface_forwarding.rs | 15 ++- .../connection_interface_irc_command1.rs | 9 +- .../connection_interface_keepalive.rs | 12 +- .../connection_interface_location.rs | 27 +++-- .../connection_interface_mail_notification.rs | 24 ++-- .../connection_interface_power_saving.rs | 12 +- .../connection_interface_presence.rs | 30 +++-- src/telepathy/connection_interface_privacy.rs | 15 ++- .../connection_interface_renaming.rs | 9 +- .../connection_interface_requests.rs | 18 +-- .../connection_interface_resources.rs | 12 +- .../connection_interface_service_point.rs | 9 +- .../connection_interface_sidecars1.rs | 9 +- .../connection_interface_simple_presence.rs | 18 +-- src/telepathy/connection_manager.rs | 21 ++-- ...ction_manager_interface_account_storage.rs | 15 ++- src/telepathy/debug.rs | 15 ++- src/telepathy/errors.rs | 2 +- src/telepathy/generic_types.rs | 2 +- src/telepathy/media_session_handler.rs | 12 +- src/telepathy/media_stream_handler.rs | 63 +++++++---- src/telepathy/properties_interface.rs | 15 ++- src/telepathy/protocol.rs | 36 +++--- .../protocol_interface_addressing.rs | 18 +-- src/telepathy/protocol_interface_avatars.rs | 30 +++-- src/telepathy/protocol_interface_presence.rs | 9 +- src/telepathy/template.rs | 6 +- 126 files changed, 1633 insertions(+), 1054 deletions(-) diff --git a/scripts/dbus-codegen b/scripts/dbus-codegen index 3c1cdc6..68f6586 100755 --- a/scripts/dbus-codegen +++ b/scripts/dbus-codegen @@ -28,6 +28,7 @@ for file in $(ls -a $specs/*.xml); do dbus-codegen-rust \ --file "$file" \ -i "org.freedesktop.Telepathy" \ + -a AsRefClosure \ -o "$out" rustfmt $out diff --git a/src/main.rs b/src/main.rs index 12674e1..0d6114d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -11,48 +11,20 @@ use padfoot::{ ConnectionManager, Protocol, CM_BUS_NAME, CM_CONN_BUS_NAME, CM_OBJECT_PATH, CONN_BUS_NAME, PROTO_BUS_NAME, PROTO_OBJECT_PATH, }; -use std::sync::Arc; use std::time::Duration; -#[derive(Debug, Default)] -struct TData { - cm: ConnectionManager, - p: Protocol, -} - -impl dbus::tree::DataType for TData { - type Interface = Arc; - type Tree = (); - type Property = (); - type ObjectPath = (); - - type Method = (); - type Signal = (); -} - fn run() -> Result<()> { - let (msg_s, msg_r) = std::sync::mpsc::channel::(); - let cm = ConnectionManager::new(Some(msg_s)); + let (cm, msg_r) = ConnectionManager::new(); + let cm_rc = std::rc::Rc::new(cm); let proto = Protocol {}; - let data = Arc::new(TData { cm: cm, p: proto }); + let proto_rc = std::rc::Rc::new(proto); - let f = Factory::new_fn::(); + let f = Factory::new_fn::<()>(); let mut tree = f.tree(()); - let cm_iface = telepathy::connection_manager_server(&f, Arc::clone(&data), |m| { - let a: &Arc = &m.iface.get_data(); - let b: &TData = &a; - - &b.cm - }); - - let proto_iface = telepathy::protocol_server(&f, Arc::clone(&data), |m| { - let a: &Arc = &m.iface.get_data(); - let b: &TData = &a; - - &b.p - }); + let cm_iface = telepathy::connection_manager_server(&f, (), move |_| cm_rc.clone() ); + let proto_iface = telepathy::protocol_server(&f, (), move |_| proto_rc.clone() ); tree = tree.add( f.object_path(CM_OBJECT_PATH, ()) diff --git a/src/padfoot/connection.rs b/src/padfoot/connection.rs index 852b7e4..640d128 100644 --- a/src/padfoot/connection.rs +++ b/src/padfoot/connection.rs @@ -7,7 +7,7 @@ use std::time::Duration; pub const CONN_BUS_NAME: &'static str = "org.freedesktop.Telepathy.Connection.padfoot.delta"; pub const CONN_OBJECT_PATH: &'static str = "/org/freedesktop/Telepathy/Connection/padfoot/delta"; -#[derive(Debug, Default)] +#[derive(Debug)] pub struct Connection { id: String, account: String, @@ -67,19 +67,6 @@ mod tests { } } -#[derive(Debug, Default)] -struct CData; - -impl dbus::tree::DataType for CData { - type Interface = Connection; - type Tree = (); - type Property = (); - type ObjectPath = (); - - type Method = (); - type Signal = (); -} - impl Connection { // This is run inside its own thread // @@ -88,8 +75,10 @@ impl Connection { pub fn run(self) { let bus = self.bus(); let path = self.path(); - let f = tree::Factory::new_fn::(); - let iface = telepathy::connection_server(&f, self, |m| m.iface.get_data()); + let c_rc = std::rc::Rc::new(self); + + let f = tree::Factory::new_fn::<()>(); + let iface = telepathy::connection_server(&f, (), move |_| c_rc.clone()); let mut tree = f.tree(()); tree = tree.add(f.object_path(path, ()).introspectable().add(iface)); @@ -169,6 +158,10 @@ impl Connection { } } +impl AsRef for std::rc::Rc { + fn as_ref(&self) -> &(dyn telepathy::Connection + 'static) { &**self } +} + impl telepathy::Connection for Connection { fn connect(&self) -> Result<(), tree::MethodErr> { Err(tree::MethodErr::no_arg()) // FIXME: should be NotImplemented? diff --git a/src/padfoot/connection_manager.rs b/src/padfoot/connection_manager.rs index e0edf65..cfe66cd 100644 --- a/src/padfoot/connection_manager.rs +++ b/src/padfoot/connection_manager.rs @@ -11,25 +11,21 @@ pub const CM_OBJECT_PATH: &'static str = "/org/freedesktop/Telepathy/ConnectionM #[derive(Debug)] pub struct ConnectionManager { conns: std::sync::Mutex>, - pub sender: Option>, + sender: mpsc::Sender, } -impl Default for ConnectionManager { - fn default() -> Self { - ConnectionManager { - conns: std::sync::Mutex::new(HashSet::::new()), - sender: None, - } - } +impl AsRef for std::rc::Rc { + fn as_ref(&self) -> &(dyn telepathy::ConnectionManager + 'static) { &**self } } impl ConnectionManager { - pub fn new(sender: Option>) -> Self { - let mut cm: ConnectionManager = Default::default(); + pub fn new() -> (Self, mpsc::Receiver) { + let (msg_s, msg_r) = std::sync::mpsc::channel::(); - cm.sender = sender; - - cm + (ConnectionManager { + conns: std::sync::Mutex::new(HashSet::::new()), + sender: msg_s, + }, msg_r) } fn create_connection( @@ -59,23 +55,17 @@ impl ConnectionManager { // Emit a NewConnection signal for the benefit of others, but the caller // learns immediately - match &self.sender { - Some(s) => { - let sig = telepathy::ConnectionManagerNewConnection { - bus_name: bus.to_owned(), - object_path: dbus_conn_path.clone(), - protocol: super::PROTO_NAME.to_string(), - }; - - let dbus_cm_path = dbus::strings::Path::new(CM_OBJECT_PATH.to_string()) - .expect("Object path should meet DBUS requirements"); - - s.send(sig.to_emit_message(&dbus_cm_path)) - .expect("send signal"); - } - _ => {} + let sig = telepathy::ConnectionManagerNewConnection { + bus_name: bus.to_owned(), + object_path: dbus_conn_path.clone(), + protocol: super::PROTO_NAME.to_string(), }; + let dbus_cm_path = dbus::strings::Path::new(CM_OBJECT_PATH.to_string()) + .expect("Object path should meet DBUS requirements"); + + self.sender.send(sig.to_emit_message(&dbus_cm_path)).expect("send signal"); + // The bus name *must* be org.freedesktop.Telepathy.Connection.padfoot.delta. Ok((bus, dbus_conn_path)) } diff --git a/src/padfoot/protocol.rs b/src/padfoot/protocol.rs index f26de4a..ccdb233 100644 --- a/src/padfoot/protocol.rs +++ b/src/padfoot/protocol.rs @@ -8,7 +8,8 @@ pub const PROTO_BUS_NAME: &'static str = "org.freedesktop.Telepathy.ConnectionManager.padfoot.delta"; pub const PROTO_NAME: &'static str = "delta"; -#[derive(Clone, Copy, Default, Debug)] + +#[derive(Debug)] pub struct Protocol {} pub type Variant = arg::Variant>; @@ -74,6 +75,10 @@ pub fn requestables() -> Vec { vec![(rf, ra)] } +impl AsRef for std::rc::Rc { + fn as_ref(&self) -> &(dyn telepathy::Protocol + 'static) { &**self } +} + impl telepathy::Protocol for Protocol { fn identify_account(&self, params: HashMap<&str, Variant>) -> Result { println!("Protocol::identify_account({:?})", params); diff --git a/src/telepathy/account.rs b/src/telepathy/account.rs index 330e2ab..c56abb4 100644 --- a/src/telepathy/account.rs +++ b/src/telepathy/account.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Account.xml -i org.freedesktop.Telepathy -o src/telepathy/account.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Account.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/account.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -63,14 +63,15 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: Account, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Account", data); let f = ::std::sync::Arc::new(f); let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.remove()?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -84,7 +85,8 @@ where let set: ::std::collections::HashMap<&str, arg::Variant>> = i.read()?; let unset: Vec<&str> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let reconnect_required = d.update_parameters(set, unset)?; let rm = minfo.msg.method_return(); let rm = rm.append1(reconnect_required); @@ -98,7 +100,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.reconnect()?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -111,7 +114,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.interfaces()?); Ok(()) }); @@ -122,14 +126,16 @@ 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.display_name()?); Ok(()) }); let fclone = f.clone(); let p = p.on_set(move |iter, pinfo| { let minfo = pinfo.to_method_info(); - let d = fclone(&minfo); + let dd = fclone(&minfo); + let d = dd.as_ref(); d.set_display_name(iter.read()?)?; Ok(()) }); @@ -140,14 +146,16 @@ 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.icon()?); Ok(()) }); let fclone = f.clone(); let p = p.on_set(move |iter, pinfo| { let minfo = pinfo.to_method_info(); - let d = fclone(&minfo); + let dd = fclone(&minfo); + let d = dd.as_ref(); d.set_icon(iter.read()?)?; Ok(()) }); @@ -158,7 +166,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.valid()?); Ok(()) }); @@ -169,14 +178,16 @@ 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.enabled()?); Ok(()) }); let fclone = f.clone(); let p = p.on_set(move |iter, pinfo| { let minfo = pinfo.to_method_info(); - let d = fclone(&minfo); + let dd = fclone(&minfo); + let d = dd.as_ref(); d.set_enabled(iter.read()?)?; Ok(()) }); @@ -187,14 +198,16 @@ 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.nickname()?); Ok(()) }); let fclone = f.clone(); let p = p.on_set(move |iter, pinfo| { let minfo = pinfo.to_method_info(); - let d = fclone(&minfo); + let dd = fclone(&minfo); + let d = dd.as_ref(); d.set_nickname(iter.read()?)?; Ok(()) }); @@ -205,14 +218,16 @@ 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.service()?); Ok(()) }); let fclone = f.clone(); let p = p.on_set(move |iter, pinfo| { let minfo = pinfo.to_method_info(); - let d = fclone(&minfo); + let dd = fclone(&minfo); + let d = dd.as_ref(); d.set_service(iter.read()?)?; Ok(()) }); @@ -227,7 +242,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.parameters()?); Ok(()) }); @@ -238,14 +254,16 @@ 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.automatic_presence()?); Ok(()) }); let fclone = f.clone(); let p = p.on_set(move |iter, pinfo| { let minfo = pinfo.to_method_info(); - let d = fclone(&minfo); + let dd = fclone(&minfo); + let d = dd.as_ref(); d.set_automatic_presence(iter.read()?)?; Ok(()) }); @@ -256,14 +274,16 @@ 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.connect_automatically()?); Ok(()) }); let fclone = f.clone(); let p = p.on_set(move |iter, pinfo| { let minfo = pinfo.to_method_info(); - let d = fclone(&minfo); + let dd = fclone(&minfo); + let d = dd.as_ref(); d.set_connect_automatically(iter.read()?)?; Ok(()) }); @@ -274,7 +294,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.connection()?); Ok(()) }); @@ -285,7 +306,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.connection_status()?); Ok(()) }); @@ -296,7 +318,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.connection_status_reason()?); Ok(()) }); @@ -307,7 +330,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.connection_error()?); Ok(()) }); @@ -322,7 +346,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.connection_error_details()?); Ok(()) }); @@ -333,7 +358,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.current_presence()?); Ok(()) }); @@ -344,14 +370,16 @@ 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.requested_presence()?); Ok(()) }); let fclone = f.clone(); let p = p.on_set(move |iter, pinfo| { let minfo = pinfo.to_method_info(); - let d = fclone(&minfo); + let dd = fclone(&minfo); + let d = dd.as_ref(); d.set_requested_presence(iter.read()?)?; Ok(()) }); @@ -362,7 +390,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.changing_presence()?); Ok(()) }); @@ -373,7 +402,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.normalized_name()?); Ok(()) }); @@ -384,7 +414,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.has_been_online()?); Ok(()) }); @@ -395,14 +426,16 @@ 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.supersedes()?); Ok(()) }); let fclone = f.clone(); let p = p.on_set(move |iter, pinfo| { let minfo = pinfo.to_method_info(); - let d = fclone(&minfo); + let dd = fclone(&minfo); + let d = dd.as_ref(); d.set_supersedes(iter.read()?)?; Ok(()) }); diff --git a/src/telepathy/account_interface_addressing.rs b/src/telepathy/account_interface_addressing.rs index 50cb101..0df7b2f 100644 --- a/src/telepathy/account_interface_addressing.rs +++ b/src/telepathy/account_interface_addressing.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Account_Interface_Addressing.xml -i org.freedesktop.Telepathy -o src/telepathy/account_interface_addressing.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Account_Interface_Addressing.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/account_interface_addressing.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -21,8 +21,8 @@ where D: tree::DataType, D::Method: Default, D::Property: Default, - T: AccountInterfaceAddressing, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Account.Interface.Addressing", @@ -34,7 +34,8 @@ where let mut i = minfo.msg.iter_init(); let urischeme: &str = i.read()?; let association: bool = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.set_urischeme_association(urischeme, association)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -49,7 +50,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.urischemes()?); Ok(()) }); diff --git a/src/telepathy/account_interface_avatar.rs b/src/telepathy/account_interface_avatar.rs index 3740926..004e23a 100644 --- a/src/telepathy/account_interface_avatar.rs +++ b/src/telepathy/account_interface_avatar.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Account_Interface_Avatar.xml -i org.freedesktop.Telepathy -o src/telepathy/account_interface_avatar.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Account_Interface_Avatar.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/account_interface_avatar.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -18,8 +18,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: AccountInterfaceAvatar, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Account.Interface.Avatar", data); let f = ::std::sync::Arc::new(f); @@ -28,14 +28,16 @@ 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.avatar()?); Ok(()) }); let fclone = f.clone(); let p = p.on_set(move |iter, pinfo| { let minfo = pinfo.to_method_info(); - let d = fclone(&minfo); + let dd = fclone(&minfo); + let d = dd.as_ref(); d.set_avatar(iter.read()?)?; Ok(()) }); diff --git a/src/telepathy/account_interface_external_password_storage.rs b/src/telepathy/account_interface_external_password_storage.rs index b9b5325..ddcfbaa 100644 --- a/src/telepathy/account_interface_external_password_storage.rs +++ b/src/telepathy/account_interface_external_password_storage.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Account_Interface_External_Password_Storage.xml -i org.freedesktop.Telepathy -o src/telepathy/account_interface_external_password_storage.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Account_Interface_External_Password_Storage.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/account_interface_external_password_storage.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -17,8 +17,8 @@ where D: tree::DataType, D::Method: Default, D::Property: Default, - T: AccountInterfaceExternalPasswordStorageDRAFT, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Account.Interface.ExternalPasswordStorage.DRAFT", @@ -27,7 +27,8 @@ where let f = ::std::sync::Arc::new(f); let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.forget_password()?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -40,7 +41,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.password_saved()?); Ok(()) }); diff --git a/src/telepathy/account_interface_hidden.rs b/src/telepathy/account_interface_hidden.rs index 9c7b95b..ed6db2e 100644 --- a/src/telepathy/account_interface_hidden.rs +++ b/src/telepathy/account_interface_hidden.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Account_Interface_Hidden.xml -i org.freedesktop.Telepathy -o src/telepathy/account_interface_hidden.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Account_Interface_Hidden.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/account_interface_hidden.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -16,8 +16,8 @@ where D: tree::DataType, D::Method: Default, D::Property: Default, - T: AccountInterfaceHiddenDRAFT1, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Account.Interface.Hidden.DRAFT1", @@ -29,7 +29,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.hidden()?); Ok(()) }); diff --git a/src/telepathy/account_interface_storage.rs b/src/telepathy/account_interface_storage.rs index f99aa8c..5acc587 100644 --- a/src/telepathy/account_interface_storage.rs +++ b/src/telepathy/account_interface_storage.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Account_Interface_Storage.xml -i org.freedesktop.Telepathy -o src/telepathy/account_interface_storage.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Account_Interface_Storage.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/account_interface_storage.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -26,8 +26,8 @@ where D: tree::DataType, D::Method: Default, D::Property: Default, - T: AccountInterfaceStorage, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Account.Interface.Storage", data); let f = ::std::sync::Arc::new(f); @@ -36,7 +36,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.storage_provider()?); Ok(()) }); @@ -48,7 +49,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.storage_identifier()?); Ok(()) }); @@ -63,7 +65,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.storage_specific_information()?); Ok(()) }); @@ -74,7 +77,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.storage_restrictions()?); Ok(()) }); diff --git a/src/telepathy/account_manager.rs b/src/telepathy/account_manager.rs index 0510c6f..f84d7f6 100644 --- a/src/telepathy/account_manager.rs +++ b/src/telepathy/account_manager.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Account_Manager.xml -i org.freedesktop.Telepathy -o src/telepathy/account_manager.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Account_Manager.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/account_manager.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -28,8 +28,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: AccountManager, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.AccountManager", data); let f = ::std::sync::Arc::new(f); @@ -43,7 +43,8 @@ where i.read()?; let properties: ::std::collections::HashMap<&str, arg::Variant>> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let account = d.create_account( connection_manager, protocol, @@ -69,7 +70,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.interfaces()?); Ok(()) }); @@ -80,7 +82,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.valid_accounts()?); Ok(()) }); @@ -91,7 +94,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.invalid_accounts()?); Ok(()) }); @@ -102,7 +106,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_account_properties()?); Ok(()) }); diff --git a/src/telepathy/account_manager_interface_hidden.rs b/src/telepathy/account_manager_interface_hidden.rs index 2e6e87c..411e80d 100644 --- a/src/telepathy/account_manager_interface_hidden.rs +++ b/src/telepathy/account_manager_interface_hidden.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Account_Manager_Interface_Hidden.xml -i org.freedesktop.Telepathy -o src/telepathy/account_manager_interface_hidden.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Account_Manager_Interface_Hidden.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/account_manager_interface_hidden.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -18,8 +18,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: AccountManagerInterfaceHiddenDRAFT1, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.AccountManager.Interface.Hidden.DRAFT1", @@ -31,7 +31,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.valid_hidden_accounts()?); Ok(()) }); @@ -42,7 +43,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.invalid_hidden_accounts()?); Ok(()) }); diff --git a/src/telepathy/all.rs b/src/telepathy/all.rs index 2ad51bc..fe9cbcf 100644 --- a/src/telepathy/all.rs +++ b/src/telepathy/all.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/all.xml -i org.freedesktop.Telepathy -o src/telepathy/all.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/all.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/all.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; diff --git a/src/telepathy/authentication_tls_certificate.rs b/src/telepathy/authentication_tls_certificate.rs index d6cdb4a..cfe5922 100644 --- a/src/telepathy/authentication_tls_certificate.rs +++ b/src/telepathy/authentication_tls_certificate.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Authentication_TLS_Certificate.xml -i org.freedesktop.Telepathy -o src/telepathy/authentication_tls_certificate.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Authentication_TLS_Certificate.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/authentication_tls_certificate.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -38,8 +38,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: AuthenticationTLSCertificate, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Authentication.TLSCertificate", @@ -48,7 +48,8 @@ where let f = ::std::sync::Arc::new(f); let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.accept()?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -64,7 +65,8 @@ where &str, ::std::collections::HashMap<&str, arg::Variant>>, )> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.reject(rejections)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -78,7 +80,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.state()?); Ok(()) }); @@ -93,7 +96,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.rejections()?); Ok(()) }); @@ -104,7 +108,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.certificate_type()?); Ok(()) }); @@ -115,7 +120,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.certificate_chain_data()?); Ok(()) }); diff --git a/src/telepathy/call_content.rs b/src/telepathy/call_content.rs index 0d30582..4bea68f 100644 --- a/src/telepathy/call_content.rs +++ b/src/telepathy/call_content.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Call_Content.xml -i org.freedesktop.Telepathy -o src/telepathy/call_content.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Call_Content.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/call_content.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -22,14 +22,15 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: Call1Content, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Call1.Content", data); let f = ::std::sync::Arc::new(f); let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.remove()?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -42,7 +43,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.interfaces()?); Ok(()) }); @@ -53,7 +55,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.name()?); Ok(()) }); @@ -64,7 +67,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.type_()?); Ok(()) }); @@ -75,7 +79,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.disposition()?); Ok(()) }); @@ -86,7 +91,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.streams()?); Ok(()) }); diff --git a/src/telepathy/call_content_interface_audio_control.rs b/src/telepathy/call_content_interface_audio_control.rs index f90f9e9..0231c82 100644 --- a/src/telepathy/call_content_interface_audio_control.rs +++ b/src/telepathy/call_content_interface_audio_control.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Call_Content_Interface_Audio_Control.xml -i org.freedesktop.Telepathy -o src/telepathy/call_content_interface_audio_control.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Call_Content_Interface_Audio_Control.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/call_content_interface_audio_control.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -19,8 +19,8 @@ where D: tree::DataType, D::Method: Default, D::Property: Default, - T: Call1ContentInterfaceAudioControl, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Call1.Content.Interface.AudioControl", @@ -31,7 +31,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let volume: i32 = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.report_input_volume(volume)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -44,7 +45,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let volume: i32 = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.report_output_volume(volume)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -58,7 +60,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.requested_input_volume()?); Ok(()) }); @@ -69,7 +72,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.requested_output_volume()?); Ok(()) }); diff --git a/src/telepathy/call_content_interface_dtmf.rs b/src/telepathy/call_content_interface_dtmf.rs index 53bca78..f56c78b 100644 --- a/src/telepathy/call_content_interface_dtmf.rs +++ b/src/telepathy/call_content_interface_dtmf.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Call_Content_Interface_DTMF.xml -i org.freedesktop.Telepathy -o src/telepathy/call_content_interface_dtmf.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Call_Content_Interface_DTMF.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/call_content_interface_dtmf.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -21,8 +21,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: Call1ContentInterfaceDTMF, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Call1.Content.Interface.DTMF", @@ -33,7 +33,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let event: u8 = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.start_tone(event)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -44,7 +45,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.stop_tone()?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -56,7 +58,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let tones: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.multiple_tones(tones)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -70,7 +73,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.currently_sending_tones()?); Ok(()) }); @@ -81,7 +85,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.deferred_tones()?); Ok(()) }); diff --git a/src/telepathy/call_content_interface_media.rs b/src/telepathy/call_content_interface_media.rs index 0f9f54a..63796c0 100644 --- a/src/telepathy/call_content_interface_media.rs +++ b/src/telepathy/call_content_interface_media.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Call_Content_Interface_Media.xml -i org.freedesktop.Telepathy -o src/telepathy/call_content_interface_media.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Call_Content_Interface_Media.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/call_content_interface_media.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -52,8 +52,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: Call1ContentInterfaceMedia, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Call1.Content.Interface.Media", @@ -67,7 +67,8 @@ where &str, arg::Variant>, > = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.update_local_media_description(media_description)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -81,7 +82,8 @@ where let mut i = minfo.msg.iter_init(); let event: u8 = i.read()?; let state: u32 = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.acknowledge_dtmfchange(event, state)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -95,7 +97,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let reason: (u32, u32, &str, &str) = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.fail(reason)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -112,7 +115,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.remote_media_descriptions()?); Ok(()) }); @@ -126,7 +130,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.local_media_descriptions()?); Ok(()) }); @@ -140,7 +145,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.media_description_offer()?); Ok(()) }); @@ -151,7 +157,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.packetization()?); Ok(()) }); @@ -162,7 +169,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.current_dtmfevent()?); Ok(()) }); @@ -173,7 +181,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.current_dtmfstate()?); Ok(()) }); diff --git a/src/telepathy/call_content_interface_video_control.rs b/src/telepathy/call_content_interface_video_control.rs index 0e59cf4..17b2cd8 100644 --- a/src/telepathy/call_content_interface_video_control.rs +++ b/src/telepathy/call_content_interface_video_control.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Call_Content_Interface_Video_Control.xml -i org.freedesktop.Telepathy -o src/telepathy/call_content_interface_video_control.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Call_Content_Interface_Video_Control.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/call_content_interface_video_control.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -21,8 +21,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: Call1ContentInterfaceVideoControl, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Call1.Content.Interface.VideoControl", @@ -34,7 +34,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.video_resolution()?); Ok(()) }); @@ -45,7 +46,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.bitrate()?); Ok(()) }); @@ -56,7 +58,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.framerate()?); Ok(()) }); @@ -67,7 +70,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.mtu()?); Ok(()) }); @@ -78,7 +82,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.manual_key_frames()?); Ok(()) }); diff --git a/src/telepathy/call_content_media_description.rs b/src/telepathy/call_content_media_description.rs index af6b718..2f7c8b5 100644 --- a/src/telepathy/call_content_media_description.rs +++ b/src/telepathy/call_content_media_description.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Call_Content_Media_Description.xml -i org.freedesktop.Telepathy -o src/telepathy/call_content_media_description.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Call_Content_Media_Description.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/call_content_media_description.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -41,8 +41,8 @@ where D: tree::DataType, D::Method: Default, D::Property: Default, - T: Call1ContentMediaDescription, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Call1.Content.MediaDescription", @@ -56,7 +56,8 @@ where &str, arg::Variant>, > = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.accept(local_media_description)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -69,7 +70,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let reason: (u32, u32, &str, &str) = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.reject(reason)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -83,7 +85,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.interfaces()?); Ok(()) }); @@ -94,7 +97,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.further_negotiation_required()?); Ok(()) }); @@ -105,7 +109,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.has_remote_information()?); Ok(()) }); @@ -123,7 +128,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.codecs()?); Ok(()) }); @@ -134,7 +140,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.remote_contact()?); Ok(()) }); @@ -146,7 +153,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.ssrcs()?); Ok(()) }); diff --git a/src/telepathy/call_content_media_description_interface_rtcp_extended_reports.rs b/src/telepathy/call_content_media_description_interface_rtcp_extended_reports.rs index 927d33a..9e3c2a9 100644 --- a/src/telepathy/call_content_media_description_interface_rtcp_extended_reports.rs +++ b/src/telepathy/call_content_media_description_interface_rtcp_extended_reports.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Call_Content_Media_Description_Interface_RTCP_Extended_Reports.xml -i org.freedesktop.Telepathy -o src/telepathy/call_content_media_description_interface_rtcp_extended_reports.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Call_Content_Media_Description_Interface_RTCP_Extended_Reports.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/call_content_media_description_interface_rtcp_extended_reports.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -22,8 +22,8 @@ where D: tree::DataType, D::Method: Default, D::Property: Default, - T: Call1ContentMediaDescriptionInterfaceRTCPExtendedReports, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTCPExtendedReports", @@ -35,7 +35,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.loss_rlemax_size()?); Ok(()) }); @@ -46,7 +47,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.duplicate_rlemax_size()?); Ok(()) }); @@ -57,7 +59,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.packet_receipt_times_max_size()?); Ok(()) }); @@ -68,7 +71,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.dlrrmax_size()?); Ok(()) }); @@ -79,7 +83,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.rttmode()?); Ok(()) }); @@ -90,7 +95,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.statistics_flags()?); Ok(()) }); @@ -101,7 +107,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.enable_metrics()?); Ok(()) }); diff --git a/src/telepathy/call_content_media_description_interface_rtcp_feedback.rs b/src/telepathy/call_content_media_description_interface_rtcp_feedback.rs index d39f9d6..29d64d6 100644 --- a/src/telepathy/call_content_media_description_interface_rtcp_feedback.rs +++ b/src/telepathy/call_content_media_description_interface_rtcp_feedback.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Call_Content_Media_Description_Interface_RTCP_Feedback.xml -i org.freedesktop.Telepathy -o src/telepathy/call_content_media_description_interface_rtcp_feedback.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Call_Content_Media_Description_Interface_RTCP_Feedback.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/call_content_media_description_interface_rtcp_feedback.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -22,8 +22,8 @@ where D: tree::DataType, D::Method: Default, D::Property: Default, - T: Call1ContentMediaDescriptionInterfaceRTCPFeedback, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTCPFeedback", @@ -39,7 +39,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.feedback_messages()?); Ok(()) }); @@ -50,7 +51,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.does_avpf()?); Ok(()) }); diff --git a/src/telepathy/call_content_media_description_interface_rtp_header_extensions.rs b/src/telepathy/call_content_media_description_interface_rtp_header_extensions.rs index eee00a7..254211e 100644 --- a/src/telepathy/call_content_media_description_interface_rtp_header_extensions.rs +++ b/src/telepathy/call_content_media_description_interface_rtp_header_extensions.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Call_Content_Media_Description_Interface_RTP_Header_Extensions.xml -i org.freedesktop.Telepathy -o src/telepathy/call_content_media_description_interface_rtp_header_extensions.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Call_Content_Media_Description_Interface_RTP_Header_Extensions.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/call_content_media_description_interface_rtp_header_extensions.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -16,8 +16,8 @@ where D: tree::DataType, D::Method: Default, D::Property: Default, - T: Call1ContentMediaDescriptionInterfaceRTPHeaderExtensions, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTPHeaderExtensions", @@ -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.header_extensions()?); Ok(()) }); diff --git a/src/telepathy/call_interface_mute.rs b/src/telepathy/call_interface_mute.rs index c6866dc..978ec61 100644 --- a/src/telepathy/call_interface_mute.rs +++ b/src/telepathy/call_interface_mute.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Call_Interface_Mute.xml -i org.freedesktop.Telepathy -o src/telepathy/call_interface_mute.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Call_Interface_Mute.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/call_interface_mute.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -18,8 +18,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: Call1InterfaceMute, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Call1.Interface.Mute", data); let f = ::std::sync::Arc::new(f); @@ -27,7 +27,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let muted: bool = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.request_muted(muted)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -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.local_mute_state()?); Ok(()) }); diff --git a/src/telepathy/call_stream.rs b/src/telepathy/call_stream.rs index 4cc58cb..1f7d8e5 100644 --- a/src/telepathy/call_stream.rs +++ b/src/telepathy/call_stream.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Call_Stream.xml -i org.freedesktop.Telepathy -o src/telepathy/call_stream.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Call_Stream.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/call_stream.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -25,8 +25,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: Call1Stream, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Call1.Stream", data); let f = ::std::sync::Arc::new(f); @@ -34,7 +34,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let send: bool = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.set_sending(send)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -48,7 +49,8 @@ where let mut i = minfo.msg.iter_init(); let contact: u32 = i.read()?; let receive: bool = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.request_receiving(contact, receive)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -63,7 +65,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.interfaces()?); Ok(()) }); @@ -75,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.remote_members()?); Ok(()) }); @@ -89,7 +93,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.remote_member_identifiers()?); Ok(()) }); @@ -100,7 +105,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.local_sending_state()?); Ok(()) }); @@ -111,7 +117,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.can_request_receiving()?); Ok(()) }); diff --git a/src/telepathy/call_stream_endpoint.rs b/src/telepathy/call_stream_endpoint.rs index 70062a3..f758468 100644 --- a/src/telepathy/call_stream_endpoint.rs +++ b/src/telepathy/call_stream_endpoint.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Call_Stream_Endpoint.xml -i org.freedesktop.Telepathy -o src/telepathy/call_stream_endpoint.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Call_Stream_Endpoint.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/call_stream_endpoint.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -98,8 +98,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: Call1StreamEndpoint, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Call1.Stream.Endpoint", data); let f = ::std::sync::Arc::new(f); @@ -118,7 +118,8 @@ where u32, ::std::collections::HashMap<&str, arg::Variant>>, ) = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.set_selected_candidate_pair(local_candidate, remote_candidate)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -133,7 +134,8 @@ where let mut i = minfo.msg.iter_init(); let component: u32 = i.read()?; let state: u32 = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.set_endpoint_state_(component, state)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -158,7 +160,8 @@ where u32, ::std::collections::HashMap<&str, arg::Variant>>, ) = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.accept_selected_candidate_pair(local_candidate, remote_candidate)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -183,7 +186,8 @@ where u32, ::std::collections::HashMap<&str, arg::Variant>>, ) = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.reject_selected_candidate_pair(local_candidate, remote_candidate)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -197,7 +201,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let controlling: bool = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.set_controlling_(controlling)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -211,7 +216,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.remote_credentials()?); Ok(()) }); @@ -227,7 +233,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.remote_candidates()?); Ok(()) }); @@ -251,7 +258,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.selected_candidate_pairs()?); Ok(()) }); @@ -263,7 +271,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.endpoint_state()?); Ok(()) }); @@ -274,7 +283,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.transport()?); Ok(()) }); @@ -285,7 +295,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.controlling()?); Ok(()) }); @@ -296,7 +307,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.is_icelite()?); Ok(()) }); diff --git a/src/telepathy/call_stream_interface_media.rs b/src/telepathy/call_stream_interface_media.rs index 10c4242..06a66f2 100644 --- a/src/telepathy/call_stream_interface_media.rs +++ b/src/telepathy/call_stream_interface_media.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Call_Stream_Interface_Media.xml -i org.freedesktop.Telepathy -o src/telepathy/call_stream_interface_media.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Call_Stream_Interface_Media.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/call_stream_interface_media.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -67,8 +67,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: Call1StreamInterfaceMedia, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Call1.Stream.Interface.Media", @@ -79,7 +79,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let state: u32 = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.complete_sending_state_change(state)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -94,7 +95,8 @@ where let reason: u32 = i.read()?; let error: &str = i.read()?; let message: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.report_sending_failure(reason, error, message)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -109,7 +111,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let state: u32 = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.complete_receiving_state_change(state)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -124,7 +127,8 @@ where let reason: u32 = i.read()?; let error: &str = i.read()?; let message: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.report_receiving_failure(reason, error, message)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -140,7 +144,8 @@ where let mut i = minfo.msg.iter_init(); let username: &str = i.read()?; let password: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.set_credentials(username, password)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -159,7 +164,8 @@ where u32, ::std::collections::HashMap<&str, arg::Variant>>, )> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.add_candidates(candidates)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -170,7 +176,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.finish_initial_candidates()?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -182,7 +189,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let reason: (u32, u32, &str, &str) = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.fail(reason)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -196,7 +204,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.sending_state()?); Ok(()) }); @@ -207,7 +216,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.receiving_state()?); Ok(()) }); @@ -218,7 +228,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.transport()?); Ok(()) }); @@ -234,7 +245,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.local_candidates()?); Ok(()) }); @@ -245,7 +257,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.local_credentials()?); Ok(()) }); @@ -256,7 +269,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.stunservers()?); Ok(()) }); @@ -271,7 +285,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.relay_info()?); Ok(()) }); @@ -282,7 +297,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.has_server_info()?); Ok(()) }); @@ -293,7 +309,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.endpoints()?); Ok(()) }); @@ -304,7 +321,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.icerestart_pending()?); Ok(()) }); diff --git a/src/telepathy/channel.rs b/src/telepathy/channel.rs index eaca799..0cee4f5 100644 --- a/src/telepathy/channel.rs +++ b/src/telepathy/channel.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel.xml -i org.freedesktop.Telepathy -o src/telepathy/channel.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -28,14 +28,15 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: Channel, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Channel", data); let f = ::std::sync::Arc::new(f); let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.close()?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -45,7 +46,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let channel_type = d.get_channel_type()?; let rm = minfo.msg.method_return(); let rm = rm.append1(channel_type); @@ -57,7 +59,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let (target_handle_type, target_handle) = d.get_handle()?; let rm = minfo.msg.method_return(); let rm = rm.append1(target_handle_type); @@ -71,7 +74,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let interfaces = d.get_interfaces()?; let rm = minfo.msg.method_return(); let rm = rm.append1(interfaces); @@ -86,7 +90,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.channel_type()?); Ok(()) }); @@ -97,7 +102,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.interfaces()?); Ok(()) }); @@ -108,7 +114,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.target_handle()?); Ok(()) }); @@ -119,7 +126,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.target_id()?); Ok(()) }); @@ -130,7 +138,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.target_handle_type()?); Ok(()) }); @@ -141,7 +150,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.requested()?); Ok(()) }); @@ -152,7 +162,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.initiator_handle()?); Ok(()) }); @@ -163,7 +174,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.initiator_id()?); Ok(()) }); diff --git a/src/telepathy/channel_bundle.rs b/src/telepathy/channel_bundle.rs index 4ceb729..5657302 100644 --- a/src/telepathy/channel_bundle.rs +++ b/src/telepathy/channel_bundle.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Bundle.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_bundle.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Bundle.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_bundle.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -16,8 +16,8 @@ where D: tree::DataType, D::Method: Default, D::Property: Default, - T: ChannelBundleDRAFT, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.ChannelBundle.DRAFT", data); let f = ::std::sync::Arc::new(f); @@ -26,7 +26,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.interfaces()?); Ok(()) }); diff --git a/src/telepathy/channel_dispatch_operation.rs b/src/telepathy/channel_dispatch_operation.rs index 9ec805d..ce3d718 100644 --- a/src/telepathy/channel_dispatch_operation.rs +++ b/src/telepathy/channel_dispatch_operation.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Dispatch_Operation.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_dispatch_operation.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Dispatch_Operation.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_dispatch_operation.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -33,8 +33,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: ChannelDispatchOperation, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.ChannelDispatchOperation", data); let f = ::std::sync::Arc::new(f); @@ -42,7 +42,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let handler: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.handle_with(handler)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -53,7 +54,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.claim()?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -66,7 +68,8 @@ where let mut i = minfo.msg.iter_init(); let handler: &str = i.read()?; let user_action_time: i64 = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.handle_with_time(handler, user_action_time)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -81,7 +84,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.interfaces()?); Ok(()) }); @@ -92,7 +96,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.connection()?); Ok(()) }); @@ -103,7 +108,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.account()?); Ok(()) }); @@ -117,7 +123,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.channels()?); Ok(()) }); @@ -128,7 +135,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.possible_handlers()?); Ok(()) }); diff --git a/src/telepathy/channel_dispatcher.rs b/src/telepathy/channel_dispatcher.rs index 556adda..1d11f19 100644 --- a/src/telepathy/channel_dispatcher.rs +++ b/src/telepathy/channel_dispatcher.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Dispatcher.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_dispatcher.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Dispatcher.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_dispatcher.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -64,8 +64,8 @@ where D: tree::DataType, D::Method: Default, D::Property: Default, - T: ChannelDispatcher, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.ChannelDispatcher", data); let f = ::std::sync::Arc::new(f); @@ -79,7 +79,8 @@ where > = i.read()?; let user_action_time: i64 = i.read()?; let preferred_handler: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let request = d.create_channel( account, requested_properties, @@ -108,7 +109,8 @@ where > = i.read()?; let user_action_time: i64 = i.read()?; let preferred_handler: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let request = d.ensure_channel( account, requested_properties, @@ -139,7 +141,8 @@ where let preferred_handler: &str = i.read()?; let hints: ::std::collections::HashMap<&str, arg::Variant>> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let request = d.create_channel_with_hints( account, requested_properties, @@ -172,7 +175,8 @@ where let preferred_handler: &str = i.read()?; let hints: ::std::collections::HashMap<&str, arg::Variant>> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let request = d.ensure_channel_with_hints( account, requested_properties, @@ -199,7 +203,8 @@ where let channels: Vec = i.read()?; let user_action_time: i64 = i.read()?; let preferred_handler: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let (delegated, not_delegated) = d.delegate_channels(channels, user_action_time, preferred_handler)?; let rm = minfo.msg.method_return(); @@ -220,7 +225,8 @@ where let mut i = minfo.msg.iter_init(); let channel: dbus::Path = i.read()?; let user_action_time: i64 = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.present_channel(channel, user_action_time)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -235,7 +241,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.interfaces()?); Ok(()) }); @@ -246,7 +253,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.supports_request_hints()?); Ok(()) }); diff --git a/src/telepathy/channel_dispatcher_interface_messages1.rs b/src/telepathy/channel_dispatcher_interface_messages1.rs index 673bd14..46748fe 100644 --- a/src/telepathy/channel_dispatcher_interface_messages1.rs +++ b/src/telepathy/channel_dispatcher_interface_messages1.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Dispatcher_Interface_Messages1.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_dispatcher_interface_messages1.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Dispatcher_Interface_Messages1.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_dispatcher_interface_messages1.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -21,8 +21,8 @@ pub fn channel_dispatcher_interface_messages1_server( where D: tree::DataType, D::Method: Default, - T: ChannelDispatcherInterfaceMessages1, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.ChannelDispatcher.Interface.Messages1", @@ -37,7 +37,8 @@ where let message: Vec<::std::collections::HashMap<&str, arg::Variant>>> = i.read()?; let flags: u32 = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let token = d.send_message(account, target_id, message, flags)?; let rm = minfo.msg.method_return(); let rm = rm.append1(token); diff --git a/src/telepathy/channel_dispatcher_interface_operation_list.rs b/src/telepathy/channel_dispatcher_interface_operation_list.rs index ddb460f..b0dcdf4 100644 --- a/src/telepathy/channel_dispatcher_interface_operation_list.rs +++ b/src/telepathy/channel_dispatcher_interface_operation_list.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Dispatcher_Interface_Operation_List.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_dispatcher_interface_operation_list.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Dispatcher_Interface_Operation_List.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_dispatcher_interface_operation_list.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -25,8 +25,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: ChannelDispatcherInterfaceOperationList, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.ChannelDispatcher.Interface.OperationList", @@ -41,7 +41,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.dispatch_operations()?); Ok(()) }); diff --git a/src/telepathy/channel_future.rs b/src/telepathy/channel_future.rs index bd50181..ade632d 100644 --- a/src/telepathy/channel_future.rs +++ b/src/telepathy/channel_future.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Future.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_future.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Future.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_future.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -16,8 +16,8 @@ where D: tree::DataType, D::Method: Default, D::Property: Default, - T: ChannelFUTURE, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Channel.FUTURE", data); let f = ::std::sync::Arc::new(f); @@ -26,7 +26,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.bundle()?); Ok(()) }); diff --git a/src/telepathy/channel_handler.rs b/src/telepathy/channel_handler.rs index 7d08f29..18f8ed4 100644 --- a/src/telepathy/channel_handler.rs +++ b/src/telepathy/channel_handler.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Handler.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_handler.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Handler.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_handler.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -23,8 +23,8 @@ pub fn channel_handler_server( where D: tree::DataType, D::Method: Default, - T: ChannelHandler, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.ChannelHandler", data); let f = ::std::sync::Arc::new(f); @@ -37,7 +37,8 @@ where let channel: dbus::Path = i.read()?; let handle_type: u32 = i.read()?; let handle: u32 = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.handle_channel( bus_name, connection, diff --git a/src/telepathy/channel_interface_addressing.rs b/src/telepathy/channel_interface_addressing.rs index d502ddf..4dfb087 100644 --- a/src/telepathy/channel_interface_addressing.rs +++ b/src/telepathy/channel_interface_addressing.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Addressing.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_interface_addressing.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Addressing.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_interface_addressing.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -19,8 +19,8 @@ where D: tree::DataType, D::Method: Default, D::Property: Default, - T: ChannelInterfaceAddressing1, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Channel.Interface.Addressing1", @@ -32,7 +32,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.target_vcard_field()?); Ok(()) }); @@ -43,7 +44,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.target_urischeme()?); Ok(()) }); @@ -54,7 +56,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.target_vcard_address()?); Ok(()) }); @@ -65,7 +68,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.target_uri()?); Ok(()) }); diff --git a/src/telepathy/channel_interface_anonymity.rs b/src/telepathy/channel_interface_anonymity.rs index 5f64643..c724b0e 100644 --- a/src/telepathy/channel_interface_anonymity.rs +++ b/src/telepathy/channel_interface_anonymity.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Anonymity.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_interface_anonymity.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Anonymity.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_interface_anonymity.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -18,8 +18,8 @@ where D: tree::DataType, D::Method: Default, D::Property: Default, - T: ChannelInterfaceAnonymity, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Channel.Interface.Anonymity", @@ -31,7 +31,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.anonymity_modes()?); Ok(()) }); @@ -42,7 +43,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.anonymity_mandatory()?); Ok(()) }); @@ -53,7 +55,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.anonymous_id()?); Ok(()) }); diff --git a/src/telepathy/channel_interface_call_state.rs b/src/telepathy/channel_interface_call_state.rs index bffad9e..c50d25b 100644 --- a/src/telepathy/channel_interface_call_state.rs +++ b/src/telepathy/channel_interface_call_state.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Call_State.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_interface_call_state.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Call_State.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_interface_call_state.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -16,8 +16,8 @@ where D: tree::DataType, D::Method: Default, D::Signal: Default, - T: ChannelInterfaceCallState, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Channel.Interface.CallState", @@ -26,7 +26,8 @@ where let f = ::std::sync::Arc::new(f); let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let states = d.get_call_states()?; let rm = minfo.msg.method_return(); let rm = rm.append1(states); diff --git a/src/telepathy/channel_interface_captcha_authentication.rs b/src/telepathy/channel_interface_captcha_authentication.rs index 0312020..389c8e0 100644 --- a/src/telepathy/channel_interface_captcha_authentication.rs +++ b/src/telepathy/channel_interface_captcha_authentication.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Captcha_Authentication.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_interface_captcha_authentication.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Captcha_Authentication.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_interface_captcha_authentication.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -33,8 +33,8 @@ where D: tree::DataType, D::Method: Default, D::Property: Default, - T: ChannelInterfaceCaptchaAuthentication1, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Channel.Interface.CaptchaAuthentication1", @@ -43,7 +43,8 @@ where let f = ::std::sync::Arc::new(f); let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let (captcha_info, number_required, language) = d.get_captchas()?; let rm = minfo.msg.method_return(); let rm = rm.append1(captcha_info); @@ -62,7 +63,8 @@ where let mut i = minfo.msg.iter_init(); let id: u32 = i.read()?; let mime_type: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let captcha_data = d.get_captcha_data(id, mime_type)?; let rm = minfo.msg.method_return(); let rm = rm.append1(captcha_data); @@ -78,7 +80,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let answers: ::std::collections::HashMap = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.answer_captchas(answers)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -92,7 +95,8 @@ where let mut i = minfo.msg.iter_init(); let reason: u32 = i.read()?; let debug_message: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.cancel_captcha(reason, debug_message)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -107,7 +111,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.can_retry_captcha()?); Ok(()) }); @@ -118,7 +123,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.captcha_status()?); Ok(()) }); @@ -129,7 +135,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.captcha_error()?); Ok(()) }); @@ -144,7 +151,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.captcha_error_details()?); Ok(()) }); diff --git a/src/telepathy/channel_interface_chat_state.rs b/src/telepathy/channel_interface_chat_state.rs index 325a045..441f911 100644 --- a/src/telepathy/channel_interface_chat_state.rs +++ b/src/telepathy/channel_interface_chat_state.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Chat_State.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_interface_chat_state.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Chat_State.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_interface_chat_state.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -18,8 +18,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: ChannelInterfaceChatState, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Channel.Interface.ChatState", @@ -30,7 +30,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let state: u32 = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.set_chat_state(state)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -45,7 +46,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.chat_states()?); Ok(()) }); diff --git a/src/telepathy/channel_interface_conference.rs b/src/telepathy/channel_interface_conference.rs index b210a55..ff7fc62 100644 --- a/src/telepathy/channel_interface_conference.rs +++ b/src/telepathy/channel_interface_conference.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Conference.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_interface_conference.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Conference.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_interface_conference.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -24,8 +24,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: ChannelInterfaceConference, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Channel.Interface.Conference", @@ -37,7 +37,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.channels()?); Ok(()) }); @@ -48,7 +49,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.initial_channels()?); Ok(()) }); @@ -59,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.initial_invitee_handles()?); Ok(()) }); @@ -70,7 +73,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.initial_invitee_ids()?); Ok(()) }); @@ -81,7 +85,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.invitation_message()?); Ok(()) }); @@ -95,7 +100,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.original_channels()?); Ok(()) }); diff --git a/src/telepathy/channel_interface_credentials_storage.rs b/src/telepathy/channel_interface_credentials_storage.rs index 8e9639b..f3baff7 100644 --- a/src/telepathy/channel_interface_credentials_storage.rs +++ b/src/telepathy/channel_interface_credentials_storage.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Credentials_Storage.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_interface_credentials_storage.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Credentials_Storage.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_interface_credentials_storage.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -15,8 +15,8 @@ pub fn channel_interface_credentials_storage_draft_server( where D: tree::DataType, D::Method: Default, - T: ChannelInterfaceCredentialsStorageDRAFT, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Channel.Interface.CredentialsStorage.DRAFT", @@ -27,7 +27,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let store: bool = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.store_credentials(store)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) diff --git a/src/telepathy/channel_interface_destroyable.rs b/src/telepathy/channel_interface_destroyable.rs index 16eb819..a63fead 100644 --- a/src/telepathy/channel_interface_destroyable.rs +++ b/src/telepathy/channel_interface_destroyable.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Destroyable.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_interface_destroyable.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Destroyable.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_interface_destroyable.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -15,8 +15,8 @@ pub fn channel_interface_destroyable_server( where D: tree::DataType, D::Method: Default, - T: ChannelInterfaceDestroyable, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Channel.Interface.Destroyable", @@ -25,7 +25,8 @@ where let f = ::std::sync::Arc::new(f); let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.destroy()?; let rm = minfo.msg.method_return(); Ok(vec![rm]) diff --git a/src/telepathy/channel_interface_dtmf.rs b/src/telepathy/channel_interface_dtmf.rs index 84f3f9e..fec9bcc 100644 --- a/src/telepathy/channel_interface_dtmf.rs +++ b/src/telepathy/channel_interface_dtmf.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_DTMF.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_interface_dtmf.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_DTMF.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_interface_dtmf.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -22,8 +22,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: ChannelInterfaceDTMF, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Channel.Interface.DTMF", data); let f = ::std::sync::Arc::new(f); @@ -32,7 +32,8 @@ where let mut i = minfo.msg.iter_init(); let stream_id: u32 = i.read()?; let event: u8 = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.start_tone(stream_id, event)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -46,7 +47,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let stream_id: u32 = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.stop_tone(stream_id)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -59,7 +61,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let tones: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.multiple_tones(tones)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -73,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.currently_sending_tones()?); Ok(()) }); @@ -84,7 +88,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.initial_tones()?); Ok(()) }); @@ -95,7 +100,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.deferred_tones()?); Ok(()) }); diff --git a/src/telepathy/channel_interface_file_transfer_metadata.rs b/src/telepathy/channel_interface_file_transfer_metadata.rs index d862455..3135636 100644 --- a/src/telepathy/channel_interface_file_transfer_metadata.rs +++ b/src/telepathy/channel_interface_file_transfer_metadata.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_File_Transfer_Metadata.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_interface_file_transfer_metadata.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_File_Transfer_Metadata.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_interface_file_transfer_metadata.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -23,8 +23,8 @@ where D: tree::DataType, D::Method: Default, D::Property: Default, - T: ChannelInterfaceFileTransferMetadata, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Channel.Interface.FileTransfer.Metadata", @@ -36,14 +36,16 @@ 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.service_name()?); Ok(()) }); let fclone = f.clone(); let p = p.on_set(move |iter, pinfo| { let minfo = pinfo.to_method_info(); - let d = fclone(&minfo); + let dd = fclone(&minfo); + let d = dd.as_ref(); d.set_service_name(iter.read()?)?; Ok(()) }); @@ -57,14 +59,16 @@ 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.metadata()?); Ok(()) }); let fclone = f.clone(); let p = p.on_set(move |iter, pinfo| { let minfo = pinfo.to_method_info(); - let d = fclone(&minfo); + let dd = fclone(&minfo); + let d = dd.as_ref(); d.set_metadata(iter.read()?)?; Ok(()) }); diff --git a/src/telepathy/channel_interface_group.rs b/src/telepathy/channel_interface_group.rs index 451b10d..e2ee124 100644 --- a/src/telepathy/channel_interface_group.rs +++ b/src/telepathy/channel_interface_group.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Group.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_interface_group.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Group.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_interface_group.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -43,8 +43,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: ChannelInterfaceGroup, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Channel.Interface.Group", data); let f = ::std::sync::Arc::new(f); @@ -53,7 +53,8 @@ where let mut i = minfo.msg.iter_init(); let contacts: Vec = i.read()?; let message: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.add_members(contacts, message)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -65,7 +66,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let (members, local_pending, remote_pending) = d.get_all_members()?; let rm = minfo.msg.method_return(); let rm = rm.append1(members); @@ -81,7 +83,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let group_flags = d.get_group_flags()?; let rm = minfo.msg.method_return(); let rm = rm.append1(group_flags); @@ -95,7 +98,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let handles: Vec = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let owners = d.get_handle_owners(handles)?; let rm = minfo.msg.method_return(); let rm = rm.append1(owners); @@ -108,7 +112,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let handles = d.get_local_pending_members()?; let rm = minfo.msg.method_return(); let rm = rm.append1(handles); @@ -120,7 +125,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let info = d.get_local_pending_members_with_info()?; let rm = minfo.msg.method_return(); let rm = rm.append1(info); @@ -132,7 +138,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let handles = d.get_members()?; let rm = minfo.msg.method_return(); let rm = rm.append1(handles); @@ -144,7 +151,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let handles = d.get_remote_pending_members()?; let rm = minfo.msg.method_return(); let rm = rm.append1(handles); @@ -156,7 +164,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let self_handle = d.get_self_handle()?; let rm = minfo.msg.method_return(); let rm = rm.append1(self_handle); @@ -171,7 +180,8 @@ where let mut i = minfo.msg.iter_init(); let contacts: Vec = i.read()?; let message: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.remove_members(contacts, message)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -187,7 +197,8 @@ where let contacts: Vec = i.read()?; let message: &str = i.read()?; let reason: u32 = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.remove_members_with_reason(contacts, message, reason)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -203,7 +214,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.group_flags()?); Ok(()) }); @@ -215,7 +227,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.handle_owners()?); Ok(()) }); @@ -227,7 +240,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.local_pending_members()?); Ok(()) }); @@ -238,7 +252,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.members()?); Ok(()) }); @@ -249,7 +264,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.remote_pending_members()?); Ok(()) }); @@ -260,7 +276,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.self_handle()?); Ok(()) }); @@ -274,7 +291,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.member_identifiers()?); Ok(()) }); diff --git a/src/telepathy/channel_interface_hold.rs b/src/telepathy/channel_interface_hold.rs index d578f3f..eb793e5 100644 --- a/src/telepathy/channel_interface_hold.rs +++ b/src/telepathy/channel_interface_hold.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Hold.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_interface_hold.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Hold.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_interface_hold.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -17,14 +17,15 @@ where D: tree::DataType, D::Method: Default, D::Signal: Default, - T: ChannelInterfaceHold, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Channel.Interface.Hold", data); let f = ::std::sync::Arc::new(f); let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let (hold_state, reason) = d.get_hold_state()?; let rm = minfo.msg.method_return(); let rm = rm.append1(hold_state); @@ -40,7 +41,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let hold: bool = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.request_hold(hold)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) diff --git a/src/telepathy/channel_interface_html.rs b/src/telepathy/channel_interface_html.rs index 254f408..7015782 100644 --- a/src/telepathy/channel_interface_html.rs +++ b/src/telepathy/channel_interface_html.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_HTML.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_interface_html.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_HTML.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_interface_html.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -13,8 +13,8 @@ pub fn channel_interface_htmldraft_server( where D: tree::DataType, D::Method: Default, - T: ChannelInterfaceHTMLDRAFT, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Channel.Interface.HTML.DRAFT", diff --git a/src/telepathy/channel_interface_media_signalling.rs b/src/telepathy/channel_interface_media_signalling.rs index 061fe95..a4cb75d 100644 --- a/src/telepathy/channel_interface_media_signalling.rs +++ b/src/telepathy/channel_interface_media_signalling.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Media_Signalling.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_interface_media_signalling.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Media_Signalling.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_interface_media_signalling.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -16,8 +16,8 @@ where D: tree::DataType, D::Method: Default, D::Signal: Default, - T: ChannelInterfaceMediaSignalling, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Channel.Interface.MediaSignalling", @@ -26,7 +26,8 @@ where let f = ::std::sync::Arc::new(f); let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let session_handlers = d.get_session_handlers()?; let rm = minfo.msg.method_return(); let rm = rm.append1(session_handlers); diff --git a/src/telepathy/channel_interface_mergeable_conference.rs b/src/telepathy/channel_interface_mergeable_conference.rs index 1cb27c1..537f42d 100644 --- a/src/telepathy/channel_interface_mergeable_conference.rs +++ b/src/telepathy/channel_interface_mergeable_conference.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Mergeable_Conference.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_interface_mergeable_conference.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Mergeable_Conference.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_interface_mergeable_conference.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -15,8 +15,8 @@ pub fn channel_interface_mergeable_conference_draft_server( where D: tree::DataType, D::Method: Default, - T: ChannelInterfaceMergeableConferenceDRAFT, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Channel.Interface.MergeableConference.DRAFT", @@ -27,7 +27,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let channel: dbus::Path = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.merge(channel)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) diff --git a/src/telepathy/channel_interface_messages.rs b/src/telepathy/channel_interface_messages.rs index b46cc0c..060484d 100644 --- a/src/telepathy/channel_interface_messages.rs +++ b/src/telepathy/channel_interface_messages.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Messages.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_interface_messages.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Messages.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_interface_messages.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -39,8 +39,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: ChannelInterfaceMessages, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Channel.Interface.Messages", data); let f = ::std::sync::Arc::new(f); @@ -50,7 +50,8 @@ where let message: Vec<::std::collections::HashMap<&str, arg::Variant>>> = i.read()?; let flags: u32 = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let token = d.send_message(message, flags)?; let rm = minfo.msg.method_return(); let rm = rm.append1(token); @@ -67,7 +68,8 @@ where let mut i = minfo.msg.iter_init(); let message_id: u32 = i.read()?; let parts: Vec = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let content = d.get_pending_message_content(message_id, parts)?; let rm = minfo.msg.method_return(); let rm = rm.append1(content); @@ -84,7 +86,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_content_types()?); Ok(()) }); @@ -95,7 +98,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.message_types()?); Ok(()) }); @@ -106,7 +110,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.message_part_support_flags()?); Ok(()) }); @@ -117,7 +122,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.pending_messages()?); Ok(()) }); @@ -128,7 +134,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.delivery_reporting_support()?); Ok(()) }); diff --git a/src/telepathy/channel_interface_password.rs b/src/telepathy/channel_interface_password.rs index 8061657..8a7751c 100644 --- a/src/telepathy/channel_interface_password.rs +++ b/src/telepathy/channel_interface_password.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Password.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_interface_password.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Password.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_interface_password.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -17,14 +17,15 @@ where D: tree::DataType, D::Method: Default, D::Signal: Default, - T: ChannelInterfacePassword, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Channel.Interface.Password", data); let f = ::std::sync::Arc::new(f); let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let password_flags = d.get_password_flags()?; let rm = minfo.msg.method_return(); let rm = rm.append1(password_flags); @@ -38,7 +39,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let password: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let correct = d.provide_password(password)?; let rm = minfo.msg.method_return(); let rm = rm.append1(correct); diff --git a/src/telepathy/channel_interface_picture.rs b/src/telepathy/channel_interface_picture.rs index c323051..042ea17 100644 --- a/src/telepathy/channel_interface_picture.rs +++ b/src/telepathy/channel_interface_picture.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Picture.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_interface_picture.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Picture.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_interface_picture.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -29,8 +29,8 @@ where D: tree::DataType, D::Method: Default, D::Property: Default, - T: ChannelInterfacePicture1, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Channel.Interface.Picture1", data); let f = ::std::sync::Arc::new(f); @@ -39,7 +39,8 @@ where let mut i = minfo.msg.iter_init(); let picture: Vec = i.read()?; let mimetype: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.set_picture(picture, mimetype)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -54,7 +55,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.picture()?); Ok(()) }); @@ -65,7 +67,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.actor()?); Ok(()) }); @@ -76,7 +79,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.actor_handle()?); Ok(()) }); @@ -87,7 +91,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.timestamp()?); Ok(()) }); @@ -98,7 +103,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.can_set()?); Ok(()) }); @@ -109,7 +115,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_mimetypes()?); Ok(()) }); @@ -120,7 +127,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.minimum_height()?); Ok(()) }); @@ -131,7 +139,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.minimum_width()?); Ok(()) }); @@ -142,7 +151,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.recommended_height()?); Ok(()) }); @@ -153,7 +163,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.recommended_width()?); Ok(()) }); @@ -164,7 +175,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.maximum_height()?); Ok(()) }); @@ -175,7 +187,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.maximum_width()?); Ok(()) }); @@ -186,7 +199,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.maximum_bytes()?); Ok(()) }); diff --git a/src/telepathy/channel_interface_room.rs b/src/telepathy/channel_interface_room.rs index 70d0d9f..bd7f07b 100644 --- a/src/telepathy/channel_interface_room.rs +++ b/src/telepathy/channel_interface_room.rs @@ -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, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, 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(()) }); diff --git a/src/telepathy/channel_interface_room_config.rs b/src/telepathy/channel_interface_room_config.rs index 617b35a..4a43fa8 100644 --- a/src/telepathy/channel_interface_room_config.rs +++ b/src/telepathy/channel_interface_room_config.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Room_Config.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_interface_room_config.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Room_Config.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_interface_room_config.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -33,8 +33,8 @@ where D: tree::DataType, D::Method: Default, D::Property: Default, - T: ChannelInterfaceRoomConfig1, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Channel.Interface.RoomConfig1", @@ -46,7 +46,8 @@ where let mut i = minfo.msg.iter_init(); let properties: ::std::collections::HashMap<&str, arg::Variant>> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.update_configuration(properties)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -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.anonymous()?); Ok(()) }); @@ -71,7 +73,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.invite_only()?); Ok(()) }); @@ -82,7 +85,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.limit()?); Ok(()) }); @@ -93,7 +97,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.moderated()?); Ok(()) }); @@ -104,7 +109,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.title()?); Ok(()) }); @@ -115,7 +121,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.description()?); Ok(()) }); @@ -126,7 +133,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.persistent()?); Ok(()) }); @@ -137,7 +145,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.private()?); Ok(()) }); @@ -148,7 +157,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.password_protected()?); Ok(()) }); @@ -159,7 +169,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.password()?); Ok(()) }); @@ -170,7 +181,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.password_hint()?); Ok(()) }); @@ -181,7 +193,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.can_update_configuration()?); Ok(()) }); @@ -192,7 +205,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.mutable_properties()?); Ok(()) }); @@ -203,7 +217,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.configuration_retrieved()?); Ok(()) }); diff --git a/src/telepathy/channel_interface_sasl_authentication.rs b/src/telepathy/channel_interface_sasl_authentication.rs index bf820e0..d569a1b 100644 --- a/src/telepathy/channel_interface_sasl_authentication.rs +++ b/src/telepathy/channel_interface_sasl_authentication.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_SASL_Authentication.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_interface_sasl_authentication.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_SASL_Authentication.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_interface_sasl_authentication.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -40,8 +40,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: ChannelInterfaceSASLAuthentication, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Channel.Interface.SASLAuthentication", @@ -52,7 +52,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let mechanism: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.start_mechanism(mechanism)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -66,7 +67,8 @@ where let mut i = minfo.msg.iter_init(); let mechanism: &str = i.read()?; let initial_data: Vec = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.start_mechanism_with_data(mechanism, initial_data)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -80,7 +82,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let response_data: Vec = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.respond(response_data)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -91,7 +94,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.accept_sasl()?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -104,7 +108,8 @@ where let mut i = minfo.msg.iter_init(); let reason: u32 = i.read()?; let debug_message: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.abort_sasl(reason, debug_message)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -119,7 +124,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.available_mechanisms()?); Ok(()) }); @@ -130,7 +136,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.has_initial_data()?); Ok(()) }); @@ -141,7 +148,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.can_try_again()?); Ok(()) }); @@ -152,7 +160,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.saslstatus()?); Ok(()) }); @@ -163,7 +172,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.saslerror()?); Ok(()) }); @@ -178,7 +188,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.saslerror_details()?); Ok(()) }); @@ -189,7 +200,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.authorization_identity()?); Ok(()) }); @@ -200,7 +212,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.default_username()?); Ok(()) }); @@ -211,7 +224,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.default_realm()?); Ok(()) }); @@ -222,7 +236,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.may_save_response()?); Ok(()) }); diff --git a/src/telepathy/channel_interface_securable.rs b/src/telepathy/channel_interface_securable.rs index bc4e2d5..2f52712 100644 --- a/src/telepathy/channel_interface_securable.rs +++ b/src/telepathy/channel_interface_securable.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Securable.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_interface_securable.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Securable.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_interface_securable.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -17,8 +17,8 @@ where D: tree::DataType, D::Method: Default, D::Property: Default, - T: ChannelInterfaceSecurable, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Channel.Interface.Securable", @@ -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.encrypted()?); 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.verified()?); Ok(()) }); diff --git a/src/telepathy/channel_interface_service_point.rs b/src/telepathy/channel_interface_service_point.rs index 90a1fa6..be5b6f4 100644 --- a/src/telepathy/channel_interface_service_point.rs +++ b/src/telepathy/channel_interface_service_point.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Service_Point.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_interface_service_point.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Service_Point.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_interface_service_point.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -18,8 +18,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: ChannelInterfaceServicePoint, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Channel.Interface.ServicePoint", @@ -31,7 +31,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.initial_service_point()?); Ok(()) }); @@ -42,7 +43,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.current_service_point()?); Ok(()) }); diff --git a/src/telepathy/channel_interface_sms.rs b/src/telepathy/channel_interface_sms.rs index 76021ee..279bae8 100644 --- a/src/telepathy/channel_interface_sms.rs +++ b/src/telepathy/channel_interface_sms.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_SMS.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_interface_sms.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_SMS.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_interface_sms.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -22,8 +22,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: ChannelInterfaceSMS, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Channel.Interface.SMS", data); let f = ::std::sync::Arc::new(f); @@ -32,7 +32,8 @@ where let mut i = minfo.msg.iter_init(); let message: Vec<::std::collections::HashMap<&str, arg::Variant>>> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let (chunks_required, remaining_characters, estimated_cost) = d.get_smslength(message)?; let rm = minfo.msg.method_return(); let rm = rm.append1(chunks_required); @@ -52,7 +53,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.flash()?); Ok(()) }); @@ -63,7 +65,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.smschannel()?); Ok(()) }); diff --git a/src/telepathy/channel_interface_splittable.rs b/src/telepathy/channel_interface_splittable.rs index d7308ec..cb91a6e 100644 --- a/src/telepathy/channel_interface_splittable.rs +++ b/src/telepathy/channel_interface_splittable.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Splittable.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_interface_splittable.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Splittable.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_interface_splittable.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -15,8 +15,8 @@ pub fn channel_interface_splittable_draft_server( where D: tree::DataType, D::Method: Default, - T: ChannelInterfaceSplittableDRAFT, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Channel.Interface.Splittable.DRAFT", @@ -25,7 +25,8 @@ where let f = ::std::sync::Arc::new(f); let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.split()?; let rm = minfo.msg.method_return(); Ok(vec![rm]) diff --git a/src/telepathy/channel_interface_subject.rs b/src/telepathy/channel_interface_subject.rs index 9914efa..c8c1de7 100644 --- a/src/telepathy/channel_interface_subject.rs +++ b/src/telepathy/channel_interface_subject.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Subject.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_interface_subject.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Subject.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_interface_subject.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -21,8 +21,8 @@ where D: tree::DataType, D::Method: Default, D::Property: Default, - T: ChannelInterfaceSubject2, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Channel.Interface.Subject2", data); let f = ::std::sync::Arc::new(f); @@ -30,7 +30,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let subject: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.set_subject(subject)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -44,7 +45,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.subject()?); Ok(()) }); @@ -55,7 +57,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.actor()?); Ok(()) }); @@ -66,7 +69,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.actor_handle()?); Ok(()) }); @@ -77,7 +81,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.timestamp()?); Ok(()) }); @@ -88,7 +93,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.can_set()?); Ok(()) }); diff --git a/src/telepathy/channel_interface_transfer.rs b/src/telepathy/channel_interface_transfer.rs index 210f735..ec748a2 100644 --- a/src/telepathy/channel_interface_transfer.rs +++ b/src/telepathy/channel_interface_transfer.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Transfer.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_interface_transfer.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Transfer.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_interface_transfer.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -15,8 +15,8 @@ pub fn channel_interface_transfer_server( where D: tree::DataType, D::Method: Default, - T: ChannelInterfaceTransfer, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Channel.Interface.Transfer", data); let f = ::std::sync::Arc::new(f); @@ -25,7 +25,8 @@ where let mut i = minfo.msg.iter_init(); let member: u32 = i.read()?; let destination: u32 = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.transfer(member, destination)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) diff --git a/src/telepathy/channel_interface_tube.rs b/src/telepathy/channel_interface_tube.rs index f85bd8f..7ce9ec3 100644 --- a/src/telepathy/channel_interface_tube.rs +++ b/src/telepathy/channel_interface_tube.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Tube.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_interface_tube.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Interface_Tube.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_interface_tube.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -23,8 +23,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: ChannelInterfaceTube, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Channel.Interface.Tube", data); let f = ::std::sync::Arc::new(f); @@ -37,7 +37,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.parameters()?); Ok(()) }); @@ -48,7 +49,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.state()?); Ok(()) }); diff --git a/src/telepathy/channel_request.rs b/src/telepathy/channel_request.rs index 58be920..7acbc0e 100644 --- a/src/telepathy/channel_request.rs +++ b/src/telepathy/channel_request.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Request.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_request.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Request.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_request.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -34,14 +34,15 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: ChannelRequest, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.ChannelRequest", data); let f = ::std::sync::Arc::new(f); let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.proceed()?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -51,7 +52,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.cancel()?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -64,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.account()?); Ok(()) }); @@ -75,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.user_action_time()?); Ok(()) }); @@ -86,7 +90,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.preferred_handler()?); Ok(()) }); @@ -101,7 +106,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.requests()?); Ok(()) }); @@ -112,7 +118,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.interfaces()?); Ok(()) }); @@ -127,7 +134,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.hints()?); Ok(()) }); diff --git a/src/telepathy/channel_type_call.rs b/src/telepathy/channel_type_call.rs index 0c51a47..0400667 100644 --- a/src/telepathy/channel_type_call.rs +++ b/src/telepathy/channel_type_call.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Type_Call.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_type_call.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Type_Call.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_type_call.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -52,14 +52,15 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: ChannelTypeCall1, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Channel.Type.Call1", data); let f = ::std::sync::Arc::new(f); let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.set_ringing()?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -69,7 +70,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.set_queued()?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -79,7 +81,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.accept()?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -93,7 +96,8 @@ where let reason: u32 = i.read()?; let detailed_hangup_reason: &str = i.read()?; let message: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.hangup(reason, detailed_hangup_reason, message)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -110,7 +114,8 @@ where let content_name: &str = i.read()?; let content_type: u32 = i.read()?; let initial_direction: u32 = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let content = d.add_content(content_name, content_type, initial_direction)?; let rm = minfo.msg.method_return(); let rm = rm.append1(content); @@ -128,7 +133,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.contents()?); Ok(()) }); @@ -143,7 +149,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.call_state_details()?); Ok(()) }); @@ -154,7 +161,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.call_state()?); Ok(()) }); @@ -165,7 +173,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.call_flags()?); Ok(()) }); @@ -176,7 +185,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.call_state_reason()?); Ok(()) }); @@ -187,7 +197,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.hardware_streaming()?); Ok(()) }); @@ -199,7 +210,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.call_members()?); Ok(()) }); @@ -213,7 +225,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.member_identifiers()?); Ok(()) }); @@ -224,7 +237,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.initial_transport()?); Ok(()) }); @@ -235,7 +249,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.initial_audio()?); Ok(()) }); @@ -246,7 +261,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.initial_video()?); Ok(()) }); @@ -257,7 +273,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.initial_audio_name()?); Ok(()) }); @@ -268,7 +285,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.initial_video_name()?); Ok(()) }); @@ -279,7 +297,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.mutable_contents()?); Ok(()) }); diff --git a/src/telepathy/channel_type_contact_list.rs b/src/telepathy/channel_type_contact_list.rs index cfa88ad..1dc4a9c 100644 --- a/src/telepathy/channel_type_contact_list.rs +++ b/src/telepathy/channel_type_contact_list.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Type_Contact_List.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_type_contact_list.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Type_Contact_List.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_type_contact_list.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -13,8 +13,8 @@ pub fn channel_type_contact_list_server( where D: tree::DataType, D::Method: Default, - T: ChannelTypeContactList, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Channel.Type.ContactList", data); let f = ::std::sync::Arc::new(f); diff --git a/src/telepathy/channel_type_contact_search.rs b/src/telepathy/channel_type_contact_search.rs index ed06439..1214ca1 100644 --- a/src/telepathy/channel_type_contact_search.rs +++ b/src/telepathy/channel_type_contact_search.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Type_Contact_Search.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_type_contact_search.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Type_Contact_Search.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_type_contact_search.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -24,8 +24,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: ChannelTypeContactSearch, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Channel.Type.ContactSearch", data); let f = ::std::sync::Arc::new(f); @@ -33,7 +33,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let terms: ::std::collections::HashMap<&str, &str> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.search(terms)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -44,7 +45,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.more()?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -54,7 +56,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.stop()?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -67,7 +70,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.search_state()?); Ok(()) }); @@ -78,7 +82,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.limit()?); Ok(()) }); @@ -89,7 +94,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.available_search_keys()?); Ok(()) }); @@ -100,7 +106,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(()) }); diff --git a/src/telepathy/channel_type_dbus_tube.rs b/src/telepathy/channel_type_dbus_tube.rs index 7e1a7fa..e0dcf23 100644 --- a/src/telepathy/channel_type_dbus_tube.rs +++ b/src/telepathy/channel_type_dbus_tube.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Type_DBus_Tube.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_type_dbus_tube.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Type_DBus_Tube.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_type_dbus_tube.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -25,8 +25,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: ChannelTypeDBusTube, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Channel.Type.DBusTube", data); let f = ::std::sync::Arc::new(f); @@ -36,7 +36,8 @@ where let parameters: ::std::collections::HashMap<&str, arg::Variant>> = i.read()?; let access_control: u32 = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let address = d.offer(parameters, access_control)?; let rm = minfo.msg.method_return(); let rm = rm.append1(address); @@ -52,7 +53,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let access_control: u32 = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let address = d.accept(access_control)?; let rm = minfo.msg.method_return(); let rm = rm.append1(address); @@ -68,7 +70,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.service_name()?); Ok(()) }); @@ -80,7 +83,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.dbus_names()?); Ok(()) }); @@ -91,7 +95,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_access_controls()?); Ok(()) }); diff --git a/src/telepathy/channel_type_file_transfer.rs b/src/telepathy/channel_type_file_transfer.rs index eaa1bed..ca15f46 100644 --- a/src/telepathy/channel_type_file_transfer.rs +++ b/src/telepathy/channel_type_file_transfer.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Type_File_Transfer.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_type_file_transfer.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Type_File_Transfer.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_type_file_transfer.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -45,8 +45,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: ChannelTypeFileTransfer, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Channel.Type.FileTransfer", data); let f = ::std::sync::Arc::new(f); @@ -57,7 +57,8 @@ where let access_control: u32 = i.read()?; let access_control_param: arg::Variant> = i.read()?; let offset: u64 = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let address = d.accept_file(address_type, access_control, access_control_param, offset)?; let rm = minfo.msg.method_return(); let rm = rm.append1(address); @@ -77,7 +78,8 @@ where let address_type: u32 = i.read()?; let access_control: u32 = i.read()?; let access_control_param: arg::Variant> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let address = d.provide_file(address_type, access_control, access_control_param)?; let rm = minfo.msg.method_return(); let rm = rm.append1(address); @@ -95,7 +97,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.state()?); Ok(()) }); @@ -106,7 +109,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.content_type()?); Ok(()) }); @@ -117,7 +121,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.filename()?); Ok(()) }); @@ -128,7 +133,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.size()?); Ok(()) }); @@ -139,7 +145,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.content_hash_type()?); Ok(()) }); @@ -150,7 +157,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.content_hash()?); Ok(()) }); @@ -161,7 +169,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.description()?); Ok(()) }); @@ -172,7 +181,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.date()?); Ok(()) }); @@ -186,7 +196,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.available_socket_types()?); Ok(()) }); @@ -197,7 +208,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.transferred_bytes()?); Ok(()) }); @@ -208,7 +220,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.initial_offset()?); Ok(()) }); @@ -219,14 +232,16 @@ 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.uri()?); Ok(()) }); let fclone = f.clone(); let p = p.on_set(move |iter, pinfo| { let minfo = pinfo.to_method_info(); - let d = fclone(&minfo); + let dd = fclone(&minfo); + let d = dd.as_ref(); d.set_uri(iter.read()?)?; Ok(()) }); @@ -237,7 +252,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.file_collection()?); Ok(()) }); diff --git a/src/telepathy/channel_type_room_list.rs b/src/telepathy/channel_type_room_list.rs index fe06c2a..d7cfd3c 100644 --- a/src/telepathy/channel_type_room_list.rs +++ b/src/telepathy/channel_type_room_list.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Type_Room_List.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_type_room_list.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Type_Room_List.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_type_room_list.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -20,14 +20,15 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: ChannelTypeRoomList, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Channel.Type.RoomList", data); let f = ::std::sync::Arc::new(f); let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let in_progress = d.get_listing_rooms()?; let rm = minfo.msg.method_return(); let rm = rm.append1(in_progress); @@ -39,7 +40,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.list_rooms()?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -49,7 +51,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.stop_listing()?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -62,7 +65,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(()) }); diff --git a/src/telepathy/channel_type_server_authentication.rs b/src/telepathy/channel_type_server_authentication.rs index 0a6d57b..518acec 100644 --- a/src/telepathy/channel_type_server_authentication.rs +++ b/src/telepathy/channel_type_server_authentication.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Type_Server_Authentication.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_type_server_authentication.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Type_Server_Authentication.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_type_server_authentication.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -16,8 +16,8 @@ where D: tree::DataType, D::Method: Default, D::Property: Default, - T: ChannelTypeServerAuthentication, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Channel.Type.ServerAuthentication", @@ -29,7 +29,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.authentication_method()?); Ok(()) }); diff --git a/src/telepathy/channel_type_server_tls_connection.rs b/src/telepathy/channel_type_server_tls_connection.rs index 114e555..3c0acaa 100644 --- a/src/telepathy/channel_type_server_tls_connection.rs +++ b/src/telepathy/channel_type_server_tls_connection.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Type_Server_TLS_Connection.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_type_server_tls_connection.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Type_Server_TLS_Connection.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_type_server_tls_connection.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -18,8 +18,8 @@ where D: tree::DataType, D::Method: Default, D::Property: Default, - T: ChannelTypeServerTLSConnection, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Channel.Type.ServerTLSConnection", @@ -31,7 +31,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_certificate()?); Ok(()) }); @@ -42,7 +43,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.hostname()?); Ok(()) }); @@ -53,7 +55,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.reference_identities()?); Ok(()) }); diff --git a/src/telepathy/channel_type_stream_tube.rs b/src/telepathy/channel_type_stream_tube.rs index 421f24a..72fa8a1 100644 --- a/src/telepathy/channel_type_stream_tube.rs +++ b/src/telepathy/channel_type_stream_tube.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Type_Stream_Tube.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_type_stream_tube.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Type_Stream_Tube.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_type_stream_tube.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -33,8 +33,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: ChannelTypeStreamTube, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Channel.Type.StreamTube", data); let f = ::std::sync::Arc::new(f); @@ -46,7 +46,8 @@ where let access_control: u32 = i.read()?; let parameters: ::std::collections::HashMap<&str, arg::Variant>> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.offer(address_type, address, access_control, parameters)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -64,7 +65,8 @@ where let address_type: u32 = i.read()?; let access_control: u32 = i.read()?; let access_control_param: arg::Variant> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let address = d.accept(address_type, access_control, access_control_param)?; let rm = minfo.msg.method_return(); let rm = rm.append1(address); @@ -82,7 +84,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.service()?); Ok(()) }); @@ -96,7 +99,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_socket_types()?); Ok(()) }); diff --git a/src/telepathy/channel_type_streamed_media.rs b/src/telepathy/channel_type_streamed_media.rs index 1437cfa..2720c9a 100644 --- a/src/telepathy/channel_type_streamed_media.rs +++ b/src/telepathy/channel_type_streamed_media.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Type_Streamed_Media.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_type_streamed_media.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Type_Streamed_Media.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_type_streamed_media.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -31,14 +31,15 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: ChannelTypeStreamedMedia, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Channel.Type.StreamedMedia", data); let f = ::std::sync::Arc::new(f); let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let streams = d.list_streams()?; let rm = minfo.msg.method_return(); let rm = rm.append1(streams); @@ -52,7 +53,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let streams: Vec = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.remove_streams(streams)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -66,7 +68,8 @@ where let mut i = minfo.msg.iter_init(); let stream_id: u32 = i.read()?; let stream_direction: u32 = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.request_stream_direction(stream_id, stream_direction)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -81,7 +84,8 @@ where let mut i = minfo.msg.iter_init(); let contact_handle: u32 = i.read()?; let types: Vec = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let streams = d.request_streams(contact_handle, types)?; let rm = minfo.msg.method_return(); let rm = rm.append1(streams); @@ -98,7 +102,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.initial_audio()?); Ok(()) }); @@ -109,7 +114,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.initial_video()?); Ok(()) }); @@ -120,7 +126,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.immutable_streams()?); Ok(()) }); diff --git a/src/telepathy/channel_type_text.rs b/src/telepathy/channel_type_text.rs index 6767c25..25b7d82 100644 --- a/src/telepathy/channel_type_text.rs +++ b/src/telepathy/channel_type_text.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Type_Text.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_type_text.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Type_Text.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_type_text.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -22,8 +22,8 @@ where D: tree::DataType, D::Method: Default, D::Signal: Default, - T: ChannelTypeText, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Channel.Type.Text", data); let f = ::std::sync::Arc::new(f); @@ -31,7 +31,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let ids: Vec = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.acknowledge_pending_messages(ids)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -42,7 +43,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let available_types = d.get_message_types()?; let rm = minfo.msg.method_return(); let rm = rm.append1(available_types); @@ -56,7 +58,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let clear: bool = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let pending_messages = d.list_pending_messages(clear)?; let rm = minfo.msg.method_return(); let rm = rm.append1(pending_messages); @@ -72,7 +75,8 @@ where let mut i = minfo.msg.iter_init(); let type_: u32 = i.read()?; let text: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.send(type_, text)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) diff --git a/src/telepathy/channel_type_tubes.rs b/src/telepathy/channel_type_tubes.rs index 733bd67..f40e1a4 100644 --- a/src/telepathy/channel_type_tubes.rs +++ b/src/telepathy/channel_type_tubes.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Type_Tubes.xml -i org.freedesktop.Telepathy -o src/telepathy/channel_type_tubes.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Channel_Type_Tubes.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/channel_type_tubes.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -61,14 +61,15 @@ where D: tree::DataType, D::Method: Default, D::Signal: Default, - T: ChannelTypeTubes, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Channel.Type.Tubes", data); let f = ::std::sync::Arc::new(f); let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let available_stream_tube_types = d.get_available_stream_tube_types()?; let rm = minfo.msg.method_return(); let rm = rm.append1(available_stream_tube_types); @@ -80,7 +81,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let available_tube_types = d.get_available_tube_types()?; let rm = minfo.msg.method_return(); let rm = rm.append1(available_tube_types); @@ -92,7 +94,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let tubes = d.list_tubes()?; let rm = minfo.msg.method_return(); let rm = rm.append1(tubes); @@ -108,7 +111,8 @@ where let service: &str = i.read()?; let parameters: ::std::collections::HashMap<&str, arg::Variant>> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let tube_id = d.offer_dbus_tube(service, parameters)?; let rm = minfo.msg.method_return(); let rm = rm.append1(tube_id); @@ -130,7 +134,8 @@ where let address: arg::Variant> = i.read()?; let access_control: u32 = i.read()?; let access_control_param: arg::Variant> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let tube_id = d.offer_stream_tube( service, parameters, @@ -157,7 +162,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let id: u32 = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let address = d.accept_dbus_tube(id)?; let rm = minfo.msg.method_return(); let rm = rm.append1(address); @@ -175,7 +181,8 @@ where let address_type: u32 = i.read()?; let access_control: u32 = i.read()?; let access_control_param: arg::Variant> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let address = d.accept_stream_tube(id, address_type, access_control, access_control_param)?; let rm = minfo.msg.method_return(); @@ -194,7 +201,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let id: u32 = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.close_tube(id)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -207,7 +215,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let id: u32 = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let address = d.get_dbus_tube_address(id)?; let rm = minfo.msg.method_return(); let rm = rm.append1(address); @@ -222,7 +231,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let id: u32 = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let dbus_names = d.get_dbus_names(id)?; let rm = minfo.msg.method_return(); let rm = rm.append1(dbus_names); @@ -237,7 +247,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let id: u32 = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let (address_type, address) = d.get_stream_tube_socket_address(id)?; let rm = minfo.msg.method_return(); let rm = rm.append1(address_type); diff --git a/src/telepathy/client.rs b/src/telepathy/client.rs index a16666e..dd48e66 100644 --- a/src/telepathy/client.rs +++ b/src/telepathy/client.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Client.xml -i org.freedesktop.Telepathy -o src/telepathy/client.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Client.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/client.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -16,8 +16,8 @@ where D: tree::DataType, D::Method: Default, D::Property: Default, - T: Client, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Client", data); let f = ::std::sync::Arc::new(f); @@ -26,7 +26,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.interfaces()?); Ok(()) }); diff --git a/src/telepathy/client_approver.rs b/src/telepathy/client_approver.rs index bf0218b..f851e0a 100644 --- a/src/telepathy/client_approver.rs +++ b/src/telepathy/client_approver.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Client_Approver.xml -i org.freedesktop.Telepathy -o src/telepathy/client_approver.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Client_Approver.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/client_approver.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -30,8 +30,8 @@ where D: tree::DataType, D::Method: Default, D::Property: Default, - T: ClientApprover, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Client.Approver", data); let f = ::std::sync::Arc::new(f); @@ -45,7 +45,8 @@ where let dispatch_operation: dbus::Path = i.read()?; let properties: ::std::collections::HashMap<&str, arg::Variant>> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.add_dispatch_operation(channels, dispatch_operation, properties)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -65,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.approver_channel_filter()?); Ok(()) }); diff --git a/src/telepathy/client_handler.rs b/src/telepathy/client_handler.rs index a0e3e72..69edf1c 100644 --- a/src/telepathy/client_handler.rs +++ b/src/telepathy/client_handler.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Client_Handler.xml -i org.freedesktop.Telepathy -o src/telepathy/client_handler.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Client_Handler.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/client_handler.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -36,8 +36,8 @@ where D: tree::DataType, D::Method: Default, D::Property: Default, - T: ClientHandler, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Client.Handler", data); let f = ::std::sync::Arc::new(f); @@ -54,7 +54,8 @@ where let user_action_time: u64 = i.read()?; let handler_info: ::std::collections::HashMap<&str, arg::Variant>> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.handle_channels( account, connection, @@ -84,7 +85,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.handler_channel_filter()?); Ok(()) }); @@ -95,7 +97,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.bypass_approval()?); Ok(()) }); @@ -106,7 +109,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.capabilities()?); Ok(()) }); @@ -117,7 +121,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.handled_channels()?); Ok(()) }); diff --git a/src/telepathy/client_handler_future.rs b/src/telepathy/client_handler_future.rs index 02a266d..c1a8261 100644 --- a/src/telepathy/client_handler_future.rs +++ b/src/telepathy/client_handler_future.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Client_Handler_Future.xml -i org.freedesktop.Telepathy -o src/telepathy/client_handler_future.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Client_Handler_Future.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/client_handler_future.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -17,8 +17,8 @@ where D: tree::DataType, D::Method: Default, D::Property: Default, - T: ClientHandlerFUTURE, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Client.Handler.FUTURE", data); let f = ::std::sync::Arc::new(f); @@ -27,7 +27,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.bypass_observers()?); Ok(()) }); @@ -38,7 +39,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.related_conferences_bypass_approval()?); Ok(()) }); diff --git a/src/telepathy/client_interface_requests.rs b/src/telepathy/client_interface_requests.rs index a331730..94036b0 100644 --- a/src/telepathy/client_interface_requests.rs +++ b/src/telepathy/client_interface_requests.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Client_Interface_Requests.xml -i org.freedesktop.Telepathy -o src/telepathy/client_interface_requests.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Client_Interface_Requests.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/client_interface_requests.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -25,8 +25,8 @@ pub fn client_interface_requests_server( where D: tree::DataType, D::Method: Default, - T: ClientInterfaceRequests, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Client.Interface.Requests", data); let f = ::std::sync::Arc::new(f); @@ -36,7 +36,8 @@ where let request: dbus::Path = i.read()?; let properties: ::std::collections::HashMap<&str, arg::Variant>> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.add_request(request, properties)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -52,7 +53,8 @@ where let request: dbus::Path = i.read()?; let error: &str = i.read()?; let message: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.remove_request(request, error, message)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) diff --git a/src/telepathy/client_observer.rs b/src/telepathy/client_observer.rs index f08c477..ce85466 100644 --- a/src/telepathy/client_observer.rs +++ b/src/telepathy/client_observer.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Client_Observer.xml -i org.freedesktop.Telepathy -o src/telepathy/client_observer.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Client_Observer.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/client_observer.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -35,8 +35,8 @@ where D: tree::DataType, D::Method: Default, D::Property: Default, - T: ClientObserver, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Client.Observer", data); let f = ::std::sync::Arc::new(f); @@ -53,7 +53,8 @@ where let requests_satisfied: Vec = i.read()?; let observer_info: ::std::collections::HashMap<&str, arg::Variant>> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.observe_channels( account, connection, @@ -83,7 +84,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.observer_channel_filter()?); Ok(()) }); @@ -94,7 +96,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.recover()?); Ok(()) }); @@ -105,7 +108,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.delay_approvers()?); Ok(()) }); diff --git a/src/telepathy/connection.rs b/src/telepathy/connection.rs index 8e13431..420baad 100644 --- a/src/telepathy/connection.rs +++ b/src/telepathy/connection.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection.xml -i org.freedesktop.Telepathy -o src/telepathy/connection.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/connection.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -51,14 +51,15 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: Connection, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Connection", data); let f = ::std::sync::Arc::new(f); let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.connect()?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -68,7 +69,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.disconnect()?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -78,7 +80,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let interfaces = d.get_interfaces()?; let rm = minfo.msg.method_return(); let rm = rm.append1(interfaces); @@ -90,7 +93,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let protocol = d.get_protocol()?; let rm = minfo.msg.method_return(); let rm = rm.append1(protocol); @@ -102,7 +106,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let self_handle = d.get_self_handle()?; let rm = minfo.msg.method_return(); let rm = rm.append1(self_handle); @@ -114,7 +119,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let status = d.get_status()?; let rm = minfo.msg.method_return(); let rm = rm.append1(status); @@ -129,7 +135,8 @@ where let mut i = minfo.msg.iter_init(); let handle_type: u32 = i.read()?; let handles: Vec = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.hold_handles(handle_type, handles)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -144,7 +151,8 @@ where let mut i = minfo.msg.iter_init(); let handle_type: u32 = i.read()?; let handles: Vec = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let identifiers = d.inspect_handles(handle_type, handles)?; let rm = minfo.msg.method_return(); let rm = rm.append1(identifiers); @@ -158,7 +166,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let channel_info = d.list_channels()?; let rm = minfo.msg.method_return(); let rm = rm.append1(channel_info); @@ -173,7 +182,8 @@ where let mut i = minfo.msg.iter_init(); let handle_type: u32 = i.read()?; let handles: Vec = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.release_handles(handle_type, handles)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -190,7 +200,8 @@ where let handle_type: u32 = i.read()?; let handle: u32 = i.read()?; let suppress_handler: bool = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let object_path = d.request_channel(type_, handle_type, handle, suppress_handler)?; let rm = minfo.msg.method_return(); let rm = rm.append1(object_path); @@ -209,7 +220,8 @@ where let mut i = minfo.msg.iter_init(); let handle_type: u32 = i.read()?; let identifiers: Vec<&str> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let handles = d.request_handles(handle_type, identifiers)?; let rm = minfo.msg.method_return(); let rm = rm.append1(handles); @@ -225,7 +237,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let tokens: Vec<&str> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.add_client_interest(tokens)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -238,7 +251,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let tokens: Vec<&str> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.remove_client_interest(tokens)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -252,7 +266,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.interfaces()?); Ok(()) }); @@ -263,7 +278,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.self_handle()?); Ok(()) }); @@ -274,7 +290,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.self_id()?); Ok(()) }); @@ -285,7 +302,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.status()?); Ok(()) }); @@ -296,7 +314,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.has_immortal_handles()?); Ok(()) }); diff --git a/src/telepathy/connection_interface_addressing.rs b/src/telepathy/connection_interface_addressing.rs index d2a1608..cd85308 100644 --- a/src/telepathy/connection_interface_addressing.rs +++ b/src/telepathy/connection_interface_addressing.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Addressing.xml -i org.freedesktop.Telepathy -o src/telepathy/connection_interface_addressing.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Addressing.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/connection_interface_addressing.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -43,8 +43,8 @@ pub fn connection_interface_addressing1_server( where D: tree::DataType, D::Method: Default, - T: ConnectionInterfaceAddressing1, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Connection.Interface.Addressing1", @@ -57,7 +57,8 @@ where let field: &str = i.read()?; let addresses: Vec<&str> = i.read()?; let interfaces: Vec<&str> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let (requested, attributes) = d.get_contacts_by_vcard_field(field, addresses, interfaces)?; let rm = minfo.msg.method_return(); @@ -78,7 +79,8 @@ where let mut i = minfo.msg.iter_init(); let uris: Vec<&str> = i.read()?; let interfaces: Vec<&str> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let (requested, attributes) = d.get_contacts_by_uri(uris, interfaces)?; let rm = minfo.msg.method_return(); let rm = rm.append1(requested); diff --git a/src/telepathy/connection_interface_aliasing.rs b/src/telepathy/connection_interface_aliasing.rs index e13db83..ce33e40 100644 --- a/src/telepathy/connection_interface_aliasing.rs +++ b/src/telepathy/connection_interface_aliasing.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Aliasing.xml -i org.freedesktop.Telepathy -o src/telepathy/connection_interface_aliasing.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Aliasing.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/connection_interface_aliasing.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -25,8 +25,8 @@ where D: tree::DataType, D::Method: Default, D::Signal: Default, - T: ConnectionInterfaceAliasing, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Connection.Interface.Aliasing", @@ -35,7 +35,8 @@ where let f = ::std::sync::Arc::new(f); let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let alias_flags = d.get_alias_flags()?; let rm = minfo.msg.method_return(); let rm = rm.append1(alias_flags); @@ -49,7 +50,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let contacts: Vec = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let aliases = d.request_aliases(contacts)?; let rm = minfo.msg.method_return(); let rm = rm.append1(aliases); @@ -64,7 +66,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let contacts: Vec = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let aliases = d.get_aliases(contacts)?; let rm = minfo.msg.method_return(); let rm = rm.append1(aliases); @@ -79,7 +82,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let aliases: ::std::collections::HashMap = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.set_aliases(aliases)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) diff --git a/src/telepathy/connection_interface_anonymity.rs b/src/telepathy/connection_interface_anonymity.rs index bddd0e4..45a8dfe 100644 --- a/src/telepathy/connection_interface_anonymity.rs +++ b/src/telepathy/connection_interface_anonymity.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Anonymity.xml -i org.freedesktop.Telepathy -o src/telepathy/connection_interface_anonymity.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Anonymity.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/connection_interface_anonymity.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -21,8 +21,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: ConnectionInterfaceAnonymity, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Connection.Interface.Anonymity", @@ -34,7 +34,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_anonymity_modes()?); Ok(()) }); @@ -45,14 +46,16 @@ 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.anonymity_mandatory()?); Ok(()) }); let fclone = f.clone(); let p = p.on_set(move |iter, pinfo| { let minfo = pinfo.to_method_info(); - let d = fclone(&minfo); + let dd = fclone(&minfo); + let d = dd.as_ref(); d.set_anonymity_mandatory(iter.read()?)?; Ok(()) }); @@ -63,14 +66,16 @@ 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.anonymity_modes()?); Ok(()) }); let fclone = f.clone(); let p = p.on_set(move |iter, pinfo| { let minfo = pinfo.to_method_info(); - let d = fclone(&minfo); + let dd = fclone(&minfo); + let d = dd.as_ref(); d.set_anonymity_modes(iter.read()?)?; Ok(()) }); diff --git a/src/telepathy/connection_interface_avatars.rs b/src/telepathy/connection_interface_avatars.rs index daf82a2..7a0fa18 100644 --- a/src/telepathy/connection_interface_avatars.rs +++ b/src/telepathy/connection_interface_avatars.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Avatars.xml -i org.freedesktop.Telepathy -o src/telepathy/connection_interface_avatars.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Avatars.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/connection_interface_avatars.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -36,8 +36,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: ConnectionInterfaceAvatars, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Connection.Interface.Avatars", @@ -46,7 +46,8 @@ where let f = ::std::sync::Arc::new(f); let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let (mimetypes, min_width, min_height, max_width, max_height, max_bytes) = d.get_avatar_requirements()?; let rm = minfo.msg.method_return(); @@ -71,7 +72,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let contacts: Vec = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let tokens = d.get_avatar_tokens(contacts)?; let rm = minfo.msg.method_return(); let rm = rm.append1(tokens); @@ -86,7 +88,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let contacts: Vec = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let tokens = d.get_known_avatar_tokens(contacts)?; let rm = minfo.msg.method_return(); let rm = rm.append1(tokens); @@ -101,7 +104,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let contact: u32 = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let (data, mimetype) = d.request_avatar(contact)?; let rm = minfo.msg.method_return(); let rm = rm.append1(data); @@ -118,7 +122,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let contacts: Vec = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.request_avatars(contacts)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -132,7 +137,8 @@ where let mut i = minfo.msg.iter_init(); let avatar: Vec = i.read()?; let mimetype: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let token = d.set_avatar(avatar, mimetype)?; let rm = minfo.msg.method_return(); let rm = rm.append1(token); @@ -146,7 +152,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.clear_avatar()?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -159,7 +166,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_avatar_mimetypes()?); Ok(()) }); @@ -170,7 +178,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.minimum_avatar_height()?); Ok(()) }); @@ -181,7 +190,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.minimum_avatar_width()?); Ok(()) }); @@ -192,7 +202,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.recommended_avatar_height()?); Ok(()) }); @@ -203,7 +214,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.recommended_avatar_width()?); Ok(()) }); @@ -214,7 +226,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.maximum_avatar_height()?); Ok(()) }); @@ -225,7 +238,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.maximum_avatar_width()?); Ok(()) }); @@ -236,7 +250,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.maximum_avatar_bytes()?); Ok(()) }); diff --git a/src/telepathy/connection_interface_balance.rs b/src/telepathy/connection_interface_balance.rs index cb17e09..272e193 100644 --- a/src/telepathy/connection_interface_balance.rs +++ b/src/telepathy/connection_interface_balance.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Balance.xml -i org.freedesktop.Telepathy -o src/telepathy/connection_interface_balance.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Balance.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/connection_interface_balance.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -18,8 +18,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: ConnectionInterfaceBalance, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Connection.Interface.Balance", @@ -31,7 +31,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.account_balance()?); Ok(()) }); @@ -42,7 +43,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.manage_credit_uri()?); Ok(()) }); diff --git a/src/telepathy/connection_interface_capabilities.rs b/src/telepathy/connection_interface_capabilities.rs index 0c48bbc..a509849 100644 --- a/src/telepathy/connection_interface_capabilities.rs +++ b/src/telepathy/connection_interface_capabilities.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Capabilities.xml -i org.freedesktop.Telepathy -o src/telepathy/connection_interface_capabilities.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Capabilities.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/connection_interface_capabilities.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -24,8 +24,8 @@ where D: tree::DataType, D::Method: Default, D::Signal: Default, - T: ConnectionInterfaceCapabilities, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Connection.Interface.Capabilities", @@ -37,7 +37,8 @@ where let mut i = minfo.msg.iter_init(); let add: Vec<(&str, u32)> = i.read()?; let remove: Vec<&str> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let self_capabilities = d.advertise_capabilities(add, remove)?; let rm = minfo.msg.method_return(); let rm = rm.append1(self_capabilities); @@ -53,7 +54,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let handles: Vec = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let contact_capabilities = d.get_capabilities(handles)?; let rm = minfo.msg.method_return(); let rm = rm.append1(contact_capabilities); diff --git a/src/telepathy/connection_interface_cellular.rs b/src/telepathy/connection_interface_cellular.rs index 8cc3022..6f1d083 100644 --- a/src/telepathy/connection_interface_cellular.rs +++ b/src/telepathy/connection_interface_cellular.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Cellular.xml -i org.freedesktop.Telepathy -o src/telepathy/connection_interface_cellular.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Cellular.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/connection_interface_cellular.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: ConnectionInterfaceCellular, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Connection.Interface.Cellular", @@ -40,14 +40,16 @@ 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.message_validity_period()?); Ok(()) }); let fclone = f.clone(); let p = p.on_set(move |iter, pinfo| { let minfo = pinfo.to_method_info(); - let d = fclone(&minfo); + let dd = fclone(&minfo); + let d = dd.as_ref(); d.set_message_validity_period(iter.read()?)?; Ok(()) }); @@ -58,14 +60,16 @@ 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.override_message_service_centre()?); Ok(()) }); let fclone = f.clone(); let p = p.on_set(move |iter, pinfo| { let minfo = pinfo.to_method_info(); - let d = fclone(&minfo); + let dd = fclone(&minfo); + let d = dd.as_ref(); d.set_override_message_service_centre(iter.read()?)?; Ok(()) }); @@ -76,14 +80,16 @@ 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.message_service_centre()?); Ok(()) }); let fclone = f.clone(); let p = p.on_set(move |iter, pinfo| { let minfo = pinfo.to_method_info(); - let d = fclone(&minfo); + let dd = fclone(&minfo); + let d = dd.as_ref(); d.set_message_service_centre(iter.read()?)?; Ok(()) }); @@ -94,7 +100,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.imsi()?); Ok(()) }); @@ -105,14 +112,16 @@ 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.message_reduced_character_set()?); Ok(()) }); let fclone = f.clone(); let p = p.on_set(move |iter, pinfo| { let minfo = pinfo.to_method_info(); - let d = fclone(&minfo); + let dd = fclone(&minfo); + let d = dd.as_ref(); d.set_message_reduced_character_set(iter.read()?)?; Ok(()) }); @@ -123,14 +132,16 @@ 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.message_national_character_set()?); Ok(()) }); let fclone = f.clone(); let p = p.on_set(move |iter, pinfo| { let minfo = pinfo.to_method_info(); - let d = fclone(&minfo); + let dd = fclone(&minfo); + let d = dd.as_ref(); d.set_message_national_character_set(iter.read()?)?; Ok(()) }); diff --git a/src/telepathy/connection_interface_client_types.rs b/src/telepathy/connection_interface_client_types.rs index 783f70d..f792627 100644 --- a/src/telepathy/connection_interface_client_types.rs +++ b/src/telepathy/connection_interface_client_types.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Client_Types.xml -i org.freedesktop.Telepathy -o src/telepathy/connection_interface_client_types.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Client_Types.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/connection_interface_client_types.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::Signal: Default, - T: ConnectionInterfaceClientTypes, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Connection.Interface.ClientTypes", @@ -32,7 +32,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let contacts: Vec = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let client_types = d.get_client_types(contacts)?; let rm = minfo.msg.method_return(); let rm = rm.append1(client_types); @@ -47,7 +48,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let contact: u32 = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let client_types = d.request_client_types(contact)?; let rm = minfo.msg.method_return(); let rm = rm.append1(client_types); diff --git a/src/telepathy/connection_interface_communication_policy.rs b/src/telepathy/connection_interface_communication_policy.rs index 3311c3b..4581ba6 100644 --- a/src/telepathy/connection_interface_communication_policy.rs +++ b/src/telepathy/connection_interface_communication_policy.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Communication_Policy.xml -i org.freedesktop.Telepathy -o src/telepathy/connection_interface_communication_policy.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Communication_Policy.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/connection_interface_communication_policy.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -28,8 +28,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: ConnectionInterfaceCommunicationPolicyDRAFT, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Connection.Interface.CommunicationPolicy.DRAFT", @@ -41,7 +41,8 @@ where let mut i = minfo.msg.iter_init(); let channel_type: &str = i.read()?; let policy: (u32, arg::Variant>) = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.set_policy(channel_type, policy)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -57,7 +58,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_policies()?); Ok(()) }); @@ -68,7 +70,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.active_policies()?); Ok(()) }); diff --git a/src/telepathy/connection_interface_contact_blocking.rs b/src/telepathy/connection_interface_contact_blocking.rs index 75df027..9d6ee52 100644 --- a/src/telepathy/connection_interface_contact_blocking.rs +++ b/src/telepathy/connection_interface_contact_blocking.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Contact_Blocking.xml -i org.freedesktop.Telepathy -o src/telepathy/connection_interface_contact_blocking.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Contact_Blocking.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/connection_interface_contact_blocking.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -26,8 +26,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: ConnectionInterfaceContactBlocking, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Connection.Interface.ContactBlocking", @@ -39,7 +39,8 @@ where let mut i = minfo.msg.iter_init(); let contacts: Vec = i.read()?; let report_abusive: bool = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.block_contacts(contacts, report_abusive)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -53,7 +54,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let contacts: Vec = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.unblock_contacts(contacts)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -64,7 +66,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let contacts = d.request_blocked_contacts()?; let rm = minfo.msg.method_return(); let rm = rm.append1(contacts); @@ -79,7 +82,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.contact_blocking_capabilities()?); Ok(()) }); diff --git a/src/telepathy/connection_interface_contact_capabilities.rs b/src/telepathy/connection_interface_contact_capabilities.rs index d38b378..48b0b80 100644 --- a/src/telepathy/connection_interface_contact_capabilities.rs +++ b/src/telepathy/connection_interface_contact_capabilities.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Contact_Capabilities.xml -i org.freedesktop.Telepathy -o src/telepathy/connection_interface_contact_capabilities.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Contact_Capabilities.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/connection_interface_contact_capabilities.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -36,8 +36,8 @@ where D: tree::DataType, D::Method: Default, D::Signal: Default, - T: ConnectionInterfaceContactCapabilities, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Connection.Interface.ContactCapabilities", @@ -52,7 +52,8 @@ where Vec<::std::collections::HashMap<&str, arg::Variant>>>, Vec<&str>, )> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.update_capabilities(handler_capabilities)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -65,7 +66,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let handles: Vec = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let contact_capabilities = d.get_contact_capabilities(handles)?; let rm = minfo.msg.method_return(); let rm = rm.append1(contact_capabilities); diff --git a/src/telepathy/connection_interface_contact_groups.rs b/src/telepathy/connection_interface_contact_groups.rs index ca3eaee..7471d05 100644 --- a/src/telepathy/connection_interface_contact_groups.rs +++ b/src/telepathy/connection_interface_contact_groups.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Contact_Groups.xml -i org.freedesktop.Telepathy -o src/telepathy/connection_interface_contact_groups.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Contact_Groups.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/connection_interface_contact_groups.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -25,8 +25,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: ConnectionInterfaceContactGroups, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Connection.Interface.ContactGroups", @@ -38,7 +38,8 @@ where let mut i = minfo.msg.iter_init(); let contact: u32 = i.read()?; let groups: Vec<&str> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.set_contact_groups(contact, groups)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -53,7 +54,8 @@ where let mut i = minfo.msg.iter_init(); let group: &str = i.read()?; let members: Vec = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.set_group_members(group, members)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -68,7 +70,8 @@ where let mut i = minfo.msg.iter_init(); let group: &str = i.read()?; let members: Vec = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.add_to_group(group, members)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -83,7 +86,8 @@ where let mut i = minfo.msg.iter_init(); let group: &str = i.read()?; let members: Vec = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.remove_from_group(group, members)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -97,7 +101,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let group: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.remove_group(group)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -111,7 +116,8 @@ where let mut i = minfo.msg.iter_init(); let old_name: &str = i.read()?; let new_name: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.rename_group(old_name, new_name)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -126,7 +132,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.disjoint_groups()?); Ok(()) }); @@ -137,7 +144,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.group_storage()?); Ok(()) }); @@ -148,7 +156,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.groups()?); Ok(()) }); diff --git a/src/telepathy/connection_interface_contact_info.rs b/src/telepathy/connection_interface_contact_info.rs index 7f382b3..b00a292 100644 --- a/src/telepathy/connection_interface_contact_info.rs +++ b/src/telepathy/connection_interface_contact_info.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Contact_Info.xml -i org.freedesktop.Telepathy -o src/telepathy/connection_interface_contact_info.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Contact_Info.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/connection_interface_contact_info.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -34,8 +34,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: ConnectionInterfaceContactInfo, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Connection.Interface.ContactInfo", @@ -46,7 +46,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let contacts: Vec = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let contact_info = d.get_contact_info(contacts)?; let rm = minfo.msg.method_return(); let rm = rm.append1(contact_info); @@ -61,7 +62,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let contacts: Vec = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.refresh_contact_info(contacts)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -74,7 +76,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let contact: u32 = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let contact_info = d.request_contact_info(contact)?; let rm = minfo.msg.method_return(); let rm = rm.append1(contact_info); @@ -89,7 +92,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let contact_info: Vec<(&str, Vec<&str>, Vec<&str>)> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.set_contact_info(contact_info)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -103,7 +107,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.contact_info_flags()?); Ok(()) }); @@ -115,7 +120,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_fields()?); Ok(()) }); diff --git a/src/telepathy/connection_interface_contact_list.rs b/src/telepathy/connection_interface_contact_list.rs index 1ed8d2a..26b1223 100644 --- a/src/telepathy/connection_interface_contact_list.rs +++ b/src/telepathy/connection_interface_contact_list.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Contact_List.xml -i org.freedesktop.Telepathy -o src/telepathy/connection_interface_contact_list.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Contact_List.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/connection_interface_contact_list.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -42,8 +42,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: ConnectionInterfaceContactList, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Connection.Interface.ContactList", @@ -55,7 +55,8 @@ where let mut i = minfo.msg.iter_init(); let interfaces: Vec<&str> = i.read()?; let hold: bool = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let attributes = d.get_contact_list_attributes(interfaces, hold)?; let rm = minfo.msg.method_return(); let rm = rm.append1(attributes); @@ -72,7 +73,8 @@ where let mut i = minfo.msg.iter_init(); let contacts: Vec = i.read()?; let message: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.request_subscription(contacts, message)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -86,7 +88,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let contacts: Vec = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.authorize_publication(contacts)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -99,7 +102,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let contacts: Vec = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.remove_contacts(contacts)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -112,7 +116,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let contacts: Vec = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.unsubscribe(contacts)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -125,7 +130,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let contacts: Vec = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.unpublish(contacts)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -136,7 +142,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.download()?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -149,7 +156,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.contact_list_state()?); Ok(()) }); @@ -160,7 +168,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.contact_list_persists()?); Ok(()) }); @@ -171,7 +180,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.can_change_contact_list()?); Ok(()) }); @@ -182,7 +192,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.request_uses_message()?); Ok(()) }); @@ -193,7 +204,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.download_at_connection()?); Ok(()) }); diff --git a/src/telepathy/connection_interface_contacts.rs b/src/telepathy/connection_interface_contacts.rs index 5614faa..f0c7741 100644 --- a/src/telepathy/connection_interface_contacts.rs +++ b/src/telepathy/connection_interface_contacts.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Contacts.xml -i org.freedesktop.Telepathy -o src/telepathy/connection_interface_contacts.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Contacts.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/connection_interface_contacts.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -39,8 +39,8 @@ where D: tree::DataType, D::Method: Default, D::Property: Default, - T: ConnectionInterfaceContacts, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Connection.Interface.Contacts", @@ -53,7 +53,8 @@ where let handles: Vec = i.read()?; let interfaces: Vec<&str> = i.read()?; let hold: bool = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let attributes = d.get_contact_attributes(handles, interfaces, hold)?; let rm = minfo.msg.method_return(); let rm = rm.append1(attributes); @@ -71,7 +72,8 @@ where let mut i = minfo.msg.iter_init(); let identifier: &str = i.read()?; let interfaces: Vec<&str> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let (handle, attributes) = d.get_contact_by_id(identifier, interfaces)?; let rm = minfo.msg.method_return(); let rm = rm.append1(handle); @@ -90,7 +92,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.contact_attribute_interfaces()?); Ok(()) }); diff --git a/src/telepathy/connection_interface_forwarding.rs b/src/telepathy/connection_interface_forwarding.rs index e0a4c28..26ac273 100644 --- a/src/telepathy/connection_interface_forwarding.rs +++ b/src/telepathy/connection_interface_forwarding.rs @@ -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, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, 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(()) }); diff --git a/src/telepathy/connection_interface_irc_command1.rs b/src/telepathy/connection_interface_irc_command1.rs index a913af7..87f7ee3 100644 --- a/src/telepathy/connection_interface_irc_command1.rs +++ b/src/telepathy/connection_interface_irc_command1.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_IRC_Command1.xml -i org.freedesktop.Telepathy -o src/telepathy/connection_interface_irc_command1.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_IRC_Command1.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/connection_interface_irc_command1.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -15,8 +15,8 @@ pub fn connection_interface_irccommand1_server( where D: tree::DataType, D::Method: Default, - T: ConnectionInterfaceIRCCommand1, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Connection.Interface.IRCCommand1", @@ -27,7 +27,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let command: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.send(command)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) diff --git a/src/telepathy/connection_interface_keepalive.rs b/src/telepathy/connection_interface_keepalive.rs index 586884e..72d4646 100644 --- a/src/telepathy/connection_interface_keepalive.rs +++ b/src/telepathy/connection_interface_keepalive.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Keepalive.xml -i org.freedesktop.Telepathy -o src/telepathy/connection_interface_keepalive.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Keepalive.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/connection_interface_keepalive.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -17,8 +17,8 @@ where D: tree::DataType, D::Method: Default, D::Property: Default, - T: ConnectionInterfaceKeepaliveDRAFT, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Connection.Interface.Keepalive.DRAFT", @@ -30,14 +30,16 @@ 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.keepalive_interval()?); Ok(()) }); let fclone = f.clone(); let p = p.on_set(move |iter, pinfo| { let minfo = pinfo.to_method_info(); - let d = fclone(&minfo); + let dd = fclone(&minfo); + let d = dd.as_ref(); d.set_keepalive_interval(iter.read()?)?; Ok(()) }); diff --git a/src/telepathy/connection_interface_location.rs b/src/telepathy/connection_interface_location.rs index 3e305a9..83f8637 100644 --- a/src/telepathy/connection_interface_location.rs +++ b/src/telepathy/connection_interface_location.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Location.xml -i org.freedesktop.Telepathy -o src/telepathy/connection_interface_location.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Location.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/connection_interface_location.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -46,8 +46,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: ConnectionInterfaceLocation, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Connection.Interface.Location", @@ -58,7 +58,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let contacts: Vec = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let locations = d.get_locations(contacts)?; let rm = minfo.msg.method_return(); let rm = rm.append1(locations); @@ -73,7 +74,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let contact: u32 = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let location = d.request_location(contact)?; let rm = minfo.msg.method_return(); let rm = rm.append1(location); @@ -89,7 +91,8 @@ where let mut i = minfo.msg.iter_init(); let location: ::std::collections::HashMap<&str, arg::Variant>> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.set_location(location)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -103,7 +106,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.location_access_control_types()?); Ok(()) }); @@ -117,14 +121,16 @@ 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.location_access_control()?); Ok(()) }); let fclone = f.clone(); let p = p.on_set(move |iter, pinfo| { let minfo = pinfo.to_method_info(); - let d = fclone(&minfo); + let dd = fclone(&minfo); + let d = dd.as_ref(); d.set_location_access_control(iter.read()?)?; Ok(()) }); @@ -135,7 +141,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_location_features()?); Ok(()) }); diff --git a/src/telepathy/connection_interface_mail_notification.rs b/src/telepathy/connection_interface_mail_notification.rs index 7affe3b..c0e1fb6 100644 --- a/src/telepathy/connection_interface_mail_notification.rs +++ b/src/telepathy/connection_interface_mail_notification.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Mail_Notification.xml -i org.freedesktop.Telepathy -o src/telepathy/connection_interface_mail_notification.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Mail_Notification.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/connection_interface_mail_notification.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -31,8 +31,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: ConnectionInterfaceMailNotification, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Connection.Interface.MailNotification", @@ -41,7 +41,8 @@ where let f = ::std::sync::Arc::new(f); let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let url = d.request_inbox_url()?; let rm = minfo.msg.method_return(); let rm = rm.append1(url); @@ -56,7 +57,8 @@ where let mut i = minfo.msg.iter_init(); let id: &str = i.read()?; let urldata: arg::Variant> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let url = d.request_mail_url(id, urldata)?; let rm = minfo.msg.method_return(); let rm = rm.append1(url); @@ -73,7 +75,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.mail_notification_flags()?); Ok(()) }); @@ -84,7 +87,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.unread_mail_count()?); Ok(()) }); @@ -99,7 +103,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.unread_mails()?); Ok(()) }); @@ -110,7 +115,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.mail_address()?); Ok(()) }); diff --git a/src/telepathy/connection_interface_power_saving.rs b/src/telepathy/connection_interface_power_saving.rs index 7f7fda2..698fb12 100644 --- a/src/telepathy/connection_interface_power_saving.rs +++ b/src/telepathy/connection_interface_power_saving.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Power_Saving.xml -i org.freedesktop.Telepathy -o src/telepathy/connection_interface_power_saving.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Power_Saving.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/connection_interface_power_saving.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -18,8 +18,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: ConnectionInterfacePowerSaving, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Connection.Interface.PowerSaving", @@ -30,7 +30,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let activate: bool = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.set_power_saving(activate)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -44,7 +45,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.power_saving_active()?); Ok(()) }); diff --git a/src/telepathy/connection_interface_presence.rs b/src/telepathy/connection_interface_presence.rs index 42af2c4..78c946b 100644 --- a/src/telepathy/connection_interface_presence.rs +++ b/src/telepathy/connection_interface_presence.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Presence.xml -i org.freedesktop.Telepathy -o src/telepathy/connection_interface_presence.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Presence.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/connection_interface_presence.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -59,8 +59,8 @@ where D: tree::DataType, D::Method: Default, D::Signal: Default, - T: ConnectionInterfacePresence, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Connection.Interface.Presence", @@ -73,7 +73,8 @@ where let status: &str = i.read()?; let parameters: ::std::collections::HashMap<&str, arg::Variant>> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.add_status(status, parameters)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -85,7 +86,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.clear_status()?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -97,7 +99,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let contacts: Vec = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let presence = d.get_presence(contacts)?; let rm = minfo.msg.method_return(); let rm = rm.append1(presence); @@ -110,7 +113,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let available_statuses = d.get_statuses()?; let rm = minfo.msg.method_return(); let rm = rm.append1(available_statuses); @@ -124,7 +128,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let status: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.remove_status(status)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -137,7 +142,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let contacts: Vec = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.request_presence(contacts)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -150,7 +156,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let time: u32 = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.set_last_activity_time(time)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -166,7 +173,8 @@ where &str, ::std::collections::HashMap<&str, arg::Variant>>, > = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.set_status(statuses)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) diff --git a/src/telepathy/connection_interface_privacy.rs b/src/telepathy/connection_interface_privacy.rs index b9b51df..076b0cd 100644 --- a/src/telepathy/connection_interface_privacy.rs +++ b/src/telepathy/connection_interface_privacy.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Privacy.xml -i org.freedesktop.Telepathy -o src/telepathy/connection_interface_privacy.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Privacy.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/connection_interface_privacy.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -18,8 +18,8 @@ where D: tree::DataType, D::Method: Default, D::Signal: Default, - T: ConnectionInterfacePrivacy, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Connection.Interface.Privacy", @@ -28,7 +28,8 @@ where let f = ::std::sync::Arc::new(f); let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let arg0 = d.get_privacy_mode()?; let rm = minfo.msg.method_return(); let rm = rm.append1(arg0); @@ -40,7 +41,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let arg0 = d.get_privacy_modes()?; let rm = minfo.msg.method_return(); let rm = rm.append1(arg0); @@ -54,7 +56,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let mode: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.set_privacy_mode(mode)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) diff --git a/src/telepathy/connection_interface_renaming.rs b/src/telepathy/connection_interface_renaming.rs index 559af6c..d98f473 100644 --- a/src/telepathy/connection_interface_renaming.rs +++ b/src/telepathy/connection_interface_renaming.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Renaming.xml -i org.freedesktop.Telepathy -o src/telepathy/connection_interface_renaming.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Renaming.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/connection_interface_renaming.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -16,8 +16,8 @@ where D: tree::DataType, D::Method: Default, D::Signal: Default, - T: ConnectionInterfaceRenaming, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Connection.Interface.Renaming", @@ -28,7 +28,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let identifier: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.request_rename(identifier)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) diff --git a/src/telepathy/connection_interface_requests.rs b/src/telepathy/connection_interface_requests.rs index b6762e9..c25924d 100644 --- a/src/telepathy/connection_interface_requests.rs +++ b/src/telepathy/connection_interface_requests.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Requests.xml -i org.freedesktop.Telepathy -o src/telepathy/connection_interface_requests.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Requests.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/connection_interface_requests.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -55,8 +55,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: ConnectionInterfaceRequests, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Connection.Interface.Requests", @@ -68,7 +68,8 @@ where let mut i = minfo.msg.iter_init(); let request: ::std::collections::HashMap<&str, arg::Variant>> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let (channel, properties) = d.create_channel(request)?; let rm = minfo.msg.method_return(); let rm = rm.append1(channel); @@ -86,7 +87,8 @@ where let mut i = minfo.msg.iter_init(); let request: ::std::collections::HashMap<&str, arg::Variant>> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let (yours, channel, properties) = d.ensure_channel(request)?; let rm = minfo.msg.method_return(); let rm = rm.append1(yours); @@ -109,7 +111,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.channels()?); Ok(()) }); @@ -123,7 +126,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.requestable_channel_classes()?); Ok(()) }); diff --git a/src/telepathy/connection_interface_resources.rs b/src/telepathy/connection_interface_resources.rs index c015f24..6c8bf39 100644 --- a/src/telepathy/connection_interface_resources.rs +++ b/src/telepathy/connection_interface_resources.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Resources.xml -i org.freedesktop.Telepathy -o src/telepathy/connection_interface_resources.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Resources.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/connection_interface_resources.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -30,8 +30,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: ConnectionInterfaceResourcesDRAFT, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Connection.Interface.Resources.DRAFT", @@ -42,7 +42,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let contacts: Vec = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let resources = d.get_resources(contacts)?; let rm = minfo.msg.method_return(); let rm = rm.append1(resources); @@ -58,7 +59,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.resources_human_readable()?); Ok(()) }); diff --git a/src/telepathy/connection_interface_service_point.rs b/src/telepathy/connection_interface_service_point.rs index 74564cd..4e2ca3c 100644 --- a/src/telepathy/connection_interface_service_point.rs +++ b/src/telepathy/connection_interface_service_point.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Service_Point.xml -i org.freedesktop.Telepathy -o src/telepathy/connection_interface_service_point.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Service_Point.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/connection_interface_service_point.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -17,8 +17,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: ConnectionInterfaceServicePoint, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Connection.Interface.ServicePoint", @@ -31,7 +31,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.known_service_points()?); Ok(()) }); diff --git a/src/telepathy/connection_interface_sidecars1.rs b/src/telepathy/connection_interface_sidecars1.rs index a9004c8..f225b78 100644 --- a/src/telepathy/connection_interface_sidecars1.rs +++ b/src/telepathy/connection_interface_sidecars1.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Sidecars1.xml -i org.freedesktop.Telepathy -o src/telepathy/connection_interface_sidecars1.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Sidecars1.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/connection_interface_sidecars1.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -24,8 +24,8 @@ pub fn connection_interface_sidecars1_server( where D: tree::DataType, D::Method: Default, - T: ConnectionInterfaceSidecars1, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Connection.Interface.Sidecars1", @@ -36,7 +36,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let main_interface: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let (path, properties) = d.ensure_sidecar(main_interface)?; let rm = minfo.msg.method_return(); let rm = rm.append1(path); diff --git a/src/telepathy/connection_interface_simple_presence.rs b/src/telepathy/connection_interface_simple_presence.rs index c132a14..7ab17df 100644 --- a/src/telepathy/connection_interface_simple_presence.rs +++ b/src/telepathy/connection_interface_simple_presence.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Simple_Presence.xml -i org.freedesktop.Telepathy -o src/telepathy/connection_interface_simple_presence.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Interface_Simple_Presence.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/connection_interface_simple_presence.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -25,8 +25,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: ConnectionInterfaceSimplePresence, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Connection.Interface.SimplePresence", @@ -38,7 +38,8 @@ where let mut i = minfo.msg.iter_init(); let status: &str = i.read()?; let status_message: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.set_presence(status, status_message)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -52,7 +53,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let contacts: Vec = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let presence = d.get_presences(contacts)?; let rm = minfo.msg.method_return(); let rm = rm.append1(presence); @@ -71,7 +73,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.statuses()?); Ok(()) }); @@ -82,7 +85,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.maximum_status_message_length()?); Ok(()) }); diff --git a/src/telepathy/connection_manager.rs b/src/telepathy/connection_manager.rs index c52e967..3836d9b 100644 --- a/src/telepathy/connection_manager.rs +++ b/src/telepathy/connection_manager.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Manager.xml -i org.freedesktop.Telepathy -o src/telepathy/connection_manager.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Manager.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/connection_manager.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -44,8 +44,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: ConnectionManager, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.ConnectionManager", data); let f = ::std::sync::Arc::new(f); @@ -53,7 +53,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let protocol: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let parameters = d.get_parameters(protocol)?; let rm = minfo.msg.method_return(); let rm = rm.append1(parameters); @@ -66,7 +67,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let protocols = d.list_protocols()?; let rm = minfo.msg.method_return(); let rm = rm.append1(protocols); @@ -82,7 +84,8 @@ where let protocol: &str = i.read()?; let parameters: ::std::collections::HashMap<&str, arg::Variant>> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let (bus_name, object_path) = d.request_connection(protocol, parameters)?; let rm = minfo.msg.method_return(); let rm = rm.append1(bus_name); @@ -104,7 +107,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.protocols()?); Ok(()) }); @@ -115,7 +119,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.interfaces()?); Ok(()) }); diff --git a/src/telepathy/connection_manager_interface_account_storage.rs b/src/telepathy/connection_manager_interface_account_storage.rs index cf98ff1..3ba7b8b 100644 --- a/src/telepathy/connection_manager_interface_account_storage.rs +++ b/src/telepathy/connection_manager_interface_account_storage.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Manager_Interface_Account_Storage.xml -i org.freedesktop.Telepathy -o src/telepathy/connection_manager_interface_account_storage.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Connection_Manager_Interface_Account_Storage.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/connection_manager_interface_account_storage.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -18,8 +18,8 @@ where D: tree::DataType, D::Method: Default, D::Property: Default, - T: ConnectionManagerInterfaceAccountStorageDRAFT, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.ConnectionManager.Interface.AccountStorage.DRAFT", @@ -30,7 +30,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let account_id: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.forget_credentials(account_id)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -43,7 +44,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let account_id: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.remove_account(account_id)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -58,7 +60,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.accounts()?); Ok(()) }); diff --git a/src/telepathy/debug.rs b/src/telepathy/debug.rs index 84670b8..b0d2b52 100644 --- a/src/telepathy/debug.rs +++ b/src/telepathy/debug.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Debug.xml -i org.freedesktop.Telepathy -o src/telepathy/debug.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Debug.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/debug.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -19,14 +19,15 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: Debug, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Debug", data); let f = ::std::sync::Arc::new(f); let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let messages = d.get_messages()?; let rm = minfo.msg.method_return(); let rm = rm.append1(messages); @@ -41,14 +42,16 @@ 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.enabled()?); Ok(()) }); let fclone = f.clone(); let p = p.on_set(move |iter, pinfo| { let minfo = pinfo.to_method_info(); - let d = fclone(&minfo); + let dd = fclone(&minfo); + let d = dd.as_ref(); d.set_enabled(iter.read()?)?; Ok(()) }); diff --git a/src/telepathy/errors.rs b/src/telepathy/errors.rs index 633f252..e5b8b9a 100644 --- a/src/telepathy/errors.rs +++ b/src/telepathy/errors.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/errors.xml -i org.freedesktop.Telepathy -o src/telepathy/errors.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/errors.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/errors.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; diff --git a/src/telepathy/generic_types.rs b/src/telepathy/generic_types.rs index 79b47c7..831d32a 100644 --- a/src/telepathy/generic_types.rs +++ b/src/telepathy/generic_types.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/generic-types.xml -i org.freedesktop.Telepathy -o src/telepathy/generic_types.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/generic-types.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/generic_types.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; diff --git a/src/telepathy/media_session_handler.rs b/src/telepathy/media_session_handler.rs index 64986fb..9b1433a 100644 --- a/src/telepathy/media_session_handler.rs +++ b/src/telepathy/media_session_handler.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Media_Session_Handler.xml -i org.freedesktop.Telepathy -o src/telepathy/media_session_handler.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Media_Session_Handler.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/media_session_handler.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -17,8 +17,8 @@ where D: tree::DataType, D::Method: Default, D::Signal: Default, - T: MediaSessionHandler, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Media.SessionHandler", data); let f = ::std::sync::Arc::new(f); @@ -27,7 +27,8 @@ where let mut i = minfo.msg.iter_init(); let error_code: u32 = i.read()?; let message: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.error(error_code, message)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -39,7 +40,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.ready()?; let rm = minfo.msg.method_return(); Ok(vec![rm]) diff --git a/src/telepathy/media_stream_handler.rs b/src/telepathy/media_stream_handler.rs index 42902ee..c1ad7b8 100644 --- a/src/telepathy/media_stream_handler.rs +++ b/src/telepathy/media_stream_handler.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Media_Stream_Handler.xml -i org.freedesktop.Telepathy -o src/telepathy/media_stream_handler.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Media_Stream_Handler.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/media_stream_handler.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -100,8 +100,8 @@ where D::Method: Default, D::Property: Default, D::Signal: Default, - T: MediaStreamHandler, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Media.StreamHandler", data); let f = ::std::sync::Arc::new(f); @@ -109,7 +109,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let codec_id: u32 = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.codec_choice(codec_id)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -123,7 +124,8 @@ where let mut i = minfo.msg.iter_init(); let error_code: u32 = i.read()?; let message: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.error(error_code, message)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -135,7 +137,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.native_candidates_prepared()?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -148,7 +151,8 @@ where let mut i = minfo.msg.iter_init(); let native_candidate_id: &str = i.read()?; let remote_candidate_id: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.new_active_candidate_pair(native_candidate_id, remote_candidate_id)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -165,7 +169,8 @@ where let native_transport: (u32, &str, u32, u32, &str, &str, f64, u32, &str, &str) = i.read()?; let remote_candidate_id: &str = i.read()?; let remote_transport: (u32, &str, u32, u32, &str, &str, f64, u32, &str, &str) = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.new_active_transport_pair( native_candidate_id, native_transport, @@ -187,7 +192,8 @@ where let mut i = minfo.msg.iter_init(); let candidate_id: &str = i.read()?; let transports: Vec<(u32, &str, u32, u32, &str, &str, f64, u32, &str, &str)> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.new_native_candidate(candidate_id, transports)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -208,7 +214,8 @@ where u32, ::std::collections::HashMap<&str, &str>, )> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.ready(codecs)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -228,7 +235,8 @@ where u32, ::std::collections::HashMap<&str, &str>, )> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.set_local_codecs(codecs)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -241,7 +249,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let state: u32 = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.stream_state(state)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -261,7 +270,8 @@ where u32, ::std::collections::HashMap<&str, &str>, )> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.supported_codecs(codecs)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -281,7 +291,8 @@ where u32, ::std::collections::HashMap<&str, &str>, )> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.codecs_updated(codecs)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -294,7 +305,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let held: bool = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.hold_state(held)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -305,7 +317,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.unhold_failure()?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -318,7 +331,8 @@ where let mut i = minfo.msg.iter_init(); let messages: ::std::collections::HashMap)> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.supported_feedback_messages(messages)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -331,7 +345,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let header_extensions: Vec<(u32, u32, &str, &str)> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.supported_header_extensions(header_extensions)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) @@ -345,7 +360,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.stunservers()?); Ok(()) }); @@ -356,7 +372,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.created_locally()?); Ok(()) }); @@ -367,7 +384,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.nattraversal()?); Ok(()) }); @@ -382,7 +400,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.relay_info()?); Ok(()) }); diff --git a/src/telepathy/properties_interface.rs b/src/telepathy/properties_interface.rs index 52fcd80..64bae24 100644 --- a/src/telepathy/properties_interface.rs +++ b/src/telepathy/properties_interface.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Properties_Interface.xml -i org.freedesktop.Telepathy -o src/telepathy/properties_interface.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Properties_Interface.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/properties_interface.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -24,8 +24,8 @@ where D: tree::DataType, D::Method: Default, D::Signal: Default, - T: Properties, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Properties", data); let f = ::std::sync::Arc::new(f); @@ -33,7 +33,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let properties: Vec = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let values = d.get_properties(properties)?; let rm = minfo.msg.method_return(); let rm = rm.append1(values); @@ -46,7 +47,8 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let available_properties = d.list_properties()?; let rm = minfo.msg.method_return(); let rm = rm.append1(available_properties); @@ -60,7 +62,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let properties: Vec<(u32, arg::Variant>)> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); d.set_properties(properties)?; let rm = minfo.msg.method_return(); Ok(vec![rm]) diff --git a/src/telepathy/protocol.rs b/src/telepathy/protocol.rs index 891c8df..8b4650c 100644 --- a/src/telepathy/protocol.rs +++ b/src/telepathy/protocol.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Protocol.xml -i org.freedesktop.Telepathy -o src/telepathy/protocol.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Protocol.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/protocol.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -46,8 +46,8 @@ where D: tree::DataType, D::Method: Default, D::Property: Default, - T: Protocol, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Protocol", data); let f = ::std::sync::Arc::new(f); @@ -56,7 +56,8 @@ where let mut i = minfo.msg.iter_init(); let parameters: ::std::collections::HashMap<&str, arg::Variant>> = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let account_id = d.identify_account(parameters)?; let rm = minfo.msg.method_return(); let rm = rm.append1(account_id); @@ -71,7 +72,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let contact_id: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let normalized_contact_id = d.normalize_contact(contact_id)?; let rm = minfo.msg.method_return(); let rm = rm.append1(normalized_contact_id); @@ -87,7 +89,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.interfaces()?); Ok(()) }); @@ -101,7 +104,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.parameters()?); Ok(()) }); @@ -112,7 +116,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.connection_interfaces()?); Ok(()) }); @@ -126,7 +131,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.requestable_channel_classes()?); Ok(()) }); @@ -137,7 +143,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.vcard_field()?); Ok(()) }); @@ -148,7 +155,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.english_name()?); Ok(()) }); @@ -159,7 +167,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.icon()?); Ok(()) }); @@ -170,7 +179,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.authentication_types()?); Ok(()) }); diff --git a/src/telepathy/protocol_interface_addressing.rs b/src/telepathy/protocol_interface_addressing.rs index 7e08cd2..cf7ad2a 100644 --- a/src/telepathy/protocol_interface_addressing.rs +++ b/src/telepathy/protocol_interface_addressing.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Protocol_Interface_Addressing.xml -i org.freedesktop.Telepathy -o src/telepathy/protocol_interface_addressing.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Protocol_Interface_Addressing.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/protocol_interface_addressing.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -23,8 +23,8 @@ where D: tree::DataType, D::Method: Default, D::Property: Default, - T: ProtocolInterfaceAddressing, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Protocol.Interface.Addressing", @@ -36,7 +36,8 @@ where let mut i = minfo.msg.iter_init(); let vcard_field: &str = i.read()?; let vcard_address: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let normalized_vcard_address = d.normalize_vcard_address(vcard_field, vcard_address)?; let rm = minfo.msg.method_return(); let rm = rm.append1(normalized_vcard_address); @@ -52,7 +53,8 @@ where let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); let uri: &str = i.read()?; - let d = fclone(minfo); + let dd = fclone(minfo); + let d = dd.as_ref(); let normalized_uri = d.normalize_contact_uri(uri)?; let rm = minfo.msg.method_return(); let rm = rm.append1(normalized_uri); @@ -68,7 +70,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.addressable_vcard_fields()?); Ok(()) }); @@ -79,7 +82,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.addressable_urischemes()?); Ok(()) }); diff --git a/src/telepathy/protocol_interface_avatars.rs b/src/telepathy/protocol_interface_avatars.rs index 873d887..aaa1de7 100644 --- a/src/telepathy/protocol_interface_avatars.rs +++ b/src/telepathy/protocol_interface_avatars.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Protocol_Interface_Avatars.xml -i org.freedesktop.Telepathy -o src/telepathy/protocol_interface_avatars.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Protocol_Interface_Avatars.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/protocol_interface_avatars.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -23,8 +23,8 @@ where D: tree::DataType, D::Method: Default, D::Property: Default, - T: ProtocolInterfaceAvatars, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Protocol.Interface.Avatars", data); let f = ::std::sync::Arc::new(f); @@ -33,7 +33,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_avatar_mimetypes()?); Ok(()) }); @@ -44,7 +45,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.minimum_avatar_height()?); Ok(()) }); @@ -55,7 +57,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.minimum_avatar_width()?); Ok(()) }); @@ -66,7 +69,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.recommended_avatar_height()?); Ok(()) }); @@ -77,7 +81,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.recommended_avatar_width()?); Ok(()) }); @@ -88,7 +93,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.maximum_avatar_height()?); Ok(()) }); @@ -99,7 +105,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.maximum_avatar_width()?); Ok(()) }); @@ -110,7 +117,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.maximum_avatar_bytes()?); Ok(()) }); diff --git a/src/telepathy/protocol_interface_presence.rs b/src/telepathy/protocol_interface_presence.rs index 3965cc1..eb53c1a 100644 --- a/src/telepathy/protocol_interface_presence.rs +++ b/src/telepathy/protocol_interface_presence.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Protocol_Interface_Presence.xml -i org.freedesktop.Telepathy -o src/telepathy/protocol_interface_presence.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/Protocol_Interface_Presence.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/protocol_interface_presence.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -18,8 +18,8 @@ where D: tree::DataType, D::Method: Default, D::Property: Default, - T: ProtocolInterfacePresence, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface( "org.freedesktop.Telepathy.Protocol.Interface.Presence", @@ -34,7 +34,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.statuses()?); Ok(()) }); diff --git a/src/telepathy/template.rs b/src/telepathy/template.rs index bf14278..855fae7 100644 --- a/src/telepathy/template.rs +++ b/src/telepathy/template.rs @@ -1,4 +1,4 @@ -// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/template.xml -i org.freedesktop.Telepathy -o src/telepathy/template.rs`, see https://github.com/diwic/dbus-rs +// This code was autogenerated with `dbus-codegen-rust --file telepathy-spec/spec/template.xml -i org.freedesktop.Telepathy -a AsRefClosure -o src/telepathy/template.rs`, see https://github.com/diwic/dbus-rs use dbus; use dbus::arg; use dbus::tree; @@ -13,8 +13,8 @@ pub fn foo_draft_server( where D: tree::DataType, D::Method: Default, - T: FooDRAFT, - F: 'static + for<'z> Fn(&'z tree::MethodInfo, D>) -> &'z T, + T: AsRef, + F: 'static + Fn(&tree::MethodInfo, D>) -> T, { let i = factory.interface("org.freedesktop.Telepathy.Foo.DRAFT", data); let f = ::std::sync::Arc::new(f);