From b4c2de6a1a50e1b9cdb3fc666023dd5b2d1a3e61 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Sat, 4 May 2019 17:49:34 +0200 Subject: Upgrade to 2018 edition --- src/pa_eq/dbus_api/equalizing_manager.rs | 60 ++++++++++++++++---------------- 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'src/pa_eq/dbus_api/equalizing_manager.rs') diff --git a/src/pa_eq/dbus_api/equalizing_manager.rs b/src/pa_eq/dbus_api/equalizing_manager.rs index 5f6574f..1ea6111 100644 --- a/src/pa_eq/dbus_api/equalizing_manager.rs +++ b/src/pa_eq/dbus_api/equalizing_manager.rs @@ -17,11 +17,11 @@ impl<'a, C: ::std::ops::Deref> OrgPulseAudioExtEqualizi type Err = dbus::Error; fn remove_profile(&self, name: &str) -> Result<(), Self::Err> { - let mut m = try!(self.method_call_with_args(&"org.PulseAudio.Ext.Equalizing1.Manager".into(), &"RemoveProfile".into(), |msg| { + let mut m = r#try!(self.method_call_with_args(&"org.PulseAudio.Ext.Equalizing1.Manager".into(), &"RemoveProfile".into(), |msg| { let mut i = arg::IterAppend::new(msg); i.append(name); })); - try!(m.as_result()); + r#try!(m.as_result()); Ok(()) } @@ -51,9 +51,9 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); - let name: &str = try!(i.read()); + let name: &str = r#try!(i.read()); let d = fclone(minfo); - try!(d.remove_profile(name)); + r#try!(d.remove_profile(name)); let rm = minfo.msg.method_return(); Ok(vec!(rm)) }; @@ -67,7 +67,7 @@ where let p = p.on_get(move |a, pinfo| { let minfo = pinfo.to_method_info(); let d = fclone(&minfo); - a.append(try!(d.get_interface_revision())); + a.append(r#try!(d.get_interface_revision())); Ok(()) }); let i = i.add_p(p); @@ -78,7 +78,7 @@ where let p = p.on_get(move |a, pinfo| { let minfo = pinfo.to_method_info(); let d = fclone(&minfo); - a.append(try!(d.get_equalized_sinks())); + a.append(r#try!(d.get_equalized_sinks())); Ok(()) }); let i = i.add_p(p); @@ -89,7 +89,7 @@ where let p = p.on_get(move |a, pinfo| { let minfo = pinfo.to_method_info(); let d = fclone(&minfo); - a.append(try!(d.get_profiles())); + a.append(r#try!(d.get_profiles())); Ok(()) }); let i = i.add_p(p); @@ -108,7 +108,7 @@ impl dbus::SignalArgs for OrgPulseAudioExtEqualizing1ManagerSinkAdded { (&self.sink as &arg::RefArg).append(i); } fn get(&mut self, i: &mut arg::Iter) -> Result<(), arg::TypeMismatchError> { - self.sink = try!(i.read()); + self.sink = r#try!(i.read()); Ok(()) } } @@ -125,7 +125,7 @@ impl dbus::SignalArgs for OrgPulseAudioExtEqualizing1ManagerSinkRemoved { (&self.sink as &arg::RefArg).append(i); } fn get(&mut self, i: &mut arg::Iter) -> Result<(), arg::TypeMismatchError> { - self.sink = try!(i.read()); + self.sink = r#try!(i.read()); Ok(()) } } @@ -153,11 +153,11 @@ impl<'a, C: ::std::ops::Deref> OrgFreedesktopDBusIntros type Err = dbus::Error; fn introspect(&self) -> Result { - let mut m = try!(self.method_call_with_args(&"org.freedesktop.DBus.Introspectable".into(), &"Introspect".into(), |_| { + let mut m = r#try!(self.method_call_with_args(&"org.freedesktop.DBus.Introspectable".into(), &"Introspect".into(), |_| { })); - try!(m.as_result()); + r#try!(m.as_result()); let mut i = m.iter_init(); - let data: String = try!(i.read()); + let data: String = r#try!(i.read()); Ok(data) } } @@ -174,7 +174,7 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { let d = fclone(minfo); - let data = try!(d.introspect()); + let data = r#try!(d.introspect()); let rm = minfo.msg.method_return(); let rm = rm.append1(data); Ok(vec!(rm)) @@ -196,36 +196,36 @@ impl<'a, C: ::std::ops::Deref> OrgFreedesktopDBusProper type Err = dbus::Error; fn get(&self, interface_name: &str, property_name: &str) -> Result>, Self::Err> { - let mut m = try!(self.method_call_with_args(&"org.freedesktop.DBus.Properties".into(), &"Get".into(), |msg| { + 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); i.append(property_name); })); - try!(m.as_result()); + r#try!(m.as_result()); let mut i = m.iter_init(); - let value: arg::Variant> = 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> { - let mut m = try!(self.method_call_with_args(&"org.freedesktop.DBus.Properties".into(), &"Set".into(), |msg| { + 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); i.append(property_name); i.append(value); })); - try!(m.as_result()); + r#try!(m.as_result()); Ok(()) } fn get_all(&self, interface_name: &str) -> Result<::std::collections::HashMap>>, Self::Err> { - let mut m = try!(self.method_call_with_args(&"org.freedesktop.DBus.Properties".into(), &"GetAll".into(), |msg| { + 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); })); - try!(m.as_result()); + r#try!(m.as_result()); let mut i = m.iter_init(); - let props: ::std::collections::HashMap>> = try!(i.read()); + let props: ::std::collections::HashMap>> = r#try!(i.read()); Ok(props) } } @@ -242,10 +242,10 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); - let interface_name: &str = try!(i.read()); - let property_name: &str = try!(i.read()); + let interface_name: &str = r#try!(i.read()); + let property_name: &str = r#try!(i.read()); let d = fclone(minfo); - let value = try!(d.get(interface_name, property_name)); + let value = r#try!(d.get(interface_name, property_name)); let rm = minfo.msg.method_return(); let rm = rm.append1(value); Ok(vec!(rm)) @@ -259,11 +259,11 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); - let interface_name: &str = try!(i.read()); - let property_name: &str = try!(i.read()); - let value: arg::Variant> = try!(i.read()); + 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 d = fclone(minfo); - try!(d.set(interface_name, property_name, value)); + r#try!(d.set(interface_name, property_name, value)); let rm = minfo.msg.method_return(); Ok(vec!(rm)) }; @@ -276,9 +276,9 @@ where let fclone = f.clone(); let h = move |minfo: &tree::MethodInfo, D>| { let mut i = minfo.msg.iter_init(); - let interface_name: &str = try!(i.read()); + let interface_name: &str = r#try!(i.read()); let d = fclone(minfo); - let props = try!(d.get_all(interface_name)); + let props = r#try!(d.get_all(interface_name)); let rm = minfo.msg.method_return(); let rm = rm.append1(props); Ok(vec!(rm)) -- cgit v1.2.3