From 9f054ec7e1730c32f8e6ebc4960e602c47d34671 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Sat, 4 May 2019 17:51:25 +0200 Subject: Also fix edition idioms --- src/pa_eq/dbus_api/server_lookup.rs | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'src/pa_eq/dbus_api/server_lookup.rs') diff --git a/src/pa_eq/dbus_api/server_lookup.rs b/src/pa_eq/dbus_api/server_lookup.rs index 8451024..c959df8 100644 --- a/src/pa_eq/dbus_api/server_lookup.rs +++ b/src/pa_eq/dbus_api/server_lookup.rs @@ -24,7 +24,7 @@ where D::Method: Default, D::Property: Default, T: OrgPulseAudioServerLookup1, - F: 'static + for <'z> Fn(& 'z tree::MethodInfo, D>) -> & 'z T, + F: 'static + for <'z> Fn(& 'z tree::MethodInfo<'_, tree::MTFn, D>) -> & 'z T, { let i = factory.interface("org.PulseAudio.ServerLookup1", data); let f = ::std::sync::Arc::new(f); @@ -64,12 +64,12 @@ where D: tree::DataType, D::Method: Default, T: OrgFreedesktopDBusIntrospectable, - F: 'static + for <'z> Fn(& 'z tree::MethodInfo, D>) -> & 'z T, + F: 'static + for <'z> Fn(& 'z tree::MethodInfo<'_, tree::MTFn, D>) -> & 'z T, { let i = factory.interface("org.freedesktop.DBus.Introspectable", data); let f = ::std::sync::Arc::new(f); let fclone = f.clone(); - let h = move |minfo: &tree::MethodInfo, D>| { + let h = move |minfo: &tree::MethodInfo<'_, tree::MTFn, D>| { let d = fclone(minfo); let data = r#try!(d.introspect()); let rm = minfo.msg.method_return(); @@ -84,15 +84,15 @@ where pub trait OrgFreedesktopDBusProperties { type Err; - fn get(&self, interface_name: &str, property_name: &str) -> Result>, Self::Err>; - fn set(&self, interface_name: &str, property_name: &str, value: arg::Variant>) -> Result<(), Self::Err>; - fn get_all(&self, interface_name: &str) -> Result<::std::collections::HashMap>>, Self::Err>; + fn get(&self, interface_name: &str, property_name: &str) -> Result>, Self::Err>; + fn set(&self, interface_name: &str, property_name: &str, value: arg::Variant>) -> Result<(), Self::Err>; + fn get_all(&self, interface_name: &str) -> Result<::std::collections::HashMap>>, Self::Err>; } impl<'a, C: ::std::ops::Deref> OrgFreedesktopDBusProperties for dbus::ConnPath<'a, C> { type Err = dbus::Error; - fn get(&self, interface_name: &str, property_name: &str) -> Result>, Self::Err> { + fn get(&self, interface_name: &str, property_name: &str) -> Result>, Self::Err> { let mut m = r#try!(self.method_call_with_args(&"org.freedesktop.DBus.Properties".into(), &"Get".into(), |msg| { let mut i = arg::IterAppend::new(msg); i.append(interface_name); @@ -100,11 +100,11 @@ impl<'a, C: ::std::ops::Deref> OrgFreedesktopDBusProper })); r#try!(m.as_result()); let mut i = m.iter_init(); - let value: arg::Variant> = r#try!(i.read()); + let value: arg::Variant> = r#try!(i.read()); Ok(value) } - fn set(&self, interface_name: &str, property_name: &str, value: arg::Variant>) -> Result<(), Self::Err> { + fn set(&self, interface_name: &str, property_name: &str, value: arg::Variant>) -> Result<(), Self::Err> { let mut m = r#try!(self.method_call_with_args(&"org.freedesktop.DBus.Properties".into(), &"Set".into(), |msg| { let mut i = arg::IterAppend::new(msg); i.append(interface_name); @@ -115,14 +115,14 @@ impl<'a, C: ::std::ops::Deref> OrgFreedesktopDBusProper Ok(()) } - fn get_all(&self, interface_name: &str) -> Result<::std::collections::HashMap>>, Self::Err> { + fn get_all(&self, interface_name: &str) -> Result<::std::collections::HashMap>>, Self::Err> { let mut m = r#try!(self.method_call_with_args(&"org.freedesktop.DBus.Properties".into(), &"GetAll".into(), |msg| { let mut i = arg::IterAppend::new(msg); i.append(interface_name); })); r#try!(m.as_result()); let mut i = m.iter_init(); - let props: ::std::collections::HashMap>> = r#try!(i.read()); + let props: ::std::collections::HashMap>> = r#try!(i.read()); Ok(props) } } @@ -132,12 +132,12 @@ where D: tree::DataType, D::Method: Default, T: OrgFreedesktopDBusProperties, - F: 'static + for <'z> Fn(& 'z tree::MethodInfo, D>) -> & 'z T, + F: 'static + for <'z> Fn(& 'z tree::MethodInfo<'_, tree::MTFn, D>) -> & 'z T, { let i = factory.interface("org.freedesktop.DBus.Properties", data); let f = ::std::sync::Arc::new(f); let fclone = f.clone(); - let h = move |minfo: &tree::MethodInfo, D>| { + let h = move |minfo: &tree::MethodInfo<'_, tree::MTFn, D>| { let mut i = minfo.msg.iter_init(); let interface_name: &str = r#try!(i.read()); let property_name: &str = r#try!(i.read()); @@ -154,11 +154,11 @@ where let i = i.add_m(m); let fclone = f.clone(); - let h = move |minfo: &tree::MethodInfo, D>| { + let h = move |minfo: &tree::MethodInfo<'_, tree::MTFn, D>| { let mut i = minfo.msg.iter_init(); let interface_name: &str = r#try!(i.read()); let property_name: &str = r#try!(i.read()); - let value: arg::Variant> = r#try!(i.read()); + let value: arg::Variant> = r#try!(i.read()); let d = fclone(minfo); r#try!(d.set(interface_name, property_name, value)); let rm = minfo.msg.method_return(); @@ -171,7 +171,7 @@ where let i = i.add_m(m); let fclone = f.clone(); - let h = move |minfo: &tree::MethodInfo, D>| { + let h = move |minfo: &tree::MethodInfo<'_, tree::MTFn, D>| { let mut i = minfo.msg.iter_init(); let interface_name: &str = r#try!(i.read()); let d = fclone(minfo); -- cgit v1.2.3