5 files changed, 99 insertions, 99 deletions

diff --git a/src/main.rs b/src/main.rs
index ee8f2b0..23d5a19 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -5,8 +5,8 @@ extern crate failure;
 
 #[macro_use]
 extern crate clap;
-extern crate clap_log_flag;
-extern crate clap_verbosity_flag;
+
+
 #[macro_use]
 extern crate structopt;
 
diff --git a/src/pa_eq/dbus_api/equalizing_manager.rs b/src/pa_eq/dbus_api/equalizing_manager.rs
index 1ea6111..a9eb7bc 100644
--- a/src/pa_eq/dbus_api/equalizing_manager.rs
+++ b/src/pa_eq/dbus_api/equalizing_manager.rs
@@ -44,12 +44,12 @@ where
     D::Method: Default,
     D::Property: Default,
     T: OrgPulseAudioExtEqualizing1Manager<Err=tree::MethodErr>,
-    F: 'static + for <'z> Fn(& 'z tree::MethodInfo<tree::MTFn<D>, D>) -> & 'z T,
+    F: 'static + for <'z> Fn(& 'z tree::MethodInfo<'_, tree::MTFn<D>, D>) -> & 'z T,
 {
     let i = factory.interface("org.PulseAudio.Ext.Equalizing1.Manager", data);
     let f = ::std::sync::Arc::new(f);
     let fclone = f.clone();
-    let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
+    let h = move |minfo: &tree::MethodInfo<'_, tree::MTFn<D>, D>| {
         let mut i = minfo.msg.iter_init();
         let name: &str = r#try!(i.read());
         let d = fclone(minfo);
@@ -72,7 +72,7 @@ where
     });
     let i = i.add_p(p);
 
-    let p = factory.property::<Vec<dbus::Path>, _>("EqualizedSinks", Default::default());
+    let p = factory.property::<Vec<dbus::Path<'_>>, _>("EqualizedSinks", Default::default());
     let p = p.access(tree::Access::Read);
     let fclone = f.clone();
     let p = p.on_get(move |a, pinfo| {
@@ -104,10 +104,10 @@ pub struct OrgPulseAudioExtEqualizing1ManagerSinkAdded {
 impl dbus::SignalArgs for OrgPulseAudioExtEqualizing1ManagerSinkAdded {
     const NAME: &'static str = "SinkAdded";
     const INTERFACE: &'static str = "org.PulseAudio.Ext.Equalizing1.Manager";
-    fn append(&self, i: &mut arg::IterAppend) {
-        (&self.sink as &arg::RefArg).append(i);
+    fn append(&self, i: &mut arg::IterAppend<'_>) {
+        (&self.sink as &dyn arg::RefArg).append(i);
     }
-    fn get(&mut self, i: &mut arg::Iter) -> Result<(), arg::TypeMismatchError> {
+    fn get(&mut self, i: &mut arg::Iter<'_>) -> Result<(), arg::TypeMismatchError> {
         self.sink = r#try!(i.read());
         Ok(())
     }
@@ -121,10 +121,10 @@ pub struct OrgPulseAudioExtEqualizing1ManagerSinkRemoved {
 impl dbus::SignalArgs for OrgPulseAudioExtEqualizing1ManagerSinkRemoved {
     const NAME: &'static str = "SinkRemoved";
     const INTERFACE: &'static str = "org.PulseAudio.Ext.Equalizing1.Manager";
-    fn append(&self, i: &mut arg::IterAppend) {
-        (&self.sink as &arg::RefArg).append(i);
+    fn append(&self, i: &mut arg::IterAppend<'_>) {
+        (&self.sink as &dyn arg::RefArg).append(i);
     }
-    fn get(&mut self, i: &mut arg::Iter) -> Result<(), arg::TypeMismatchError> {
+    fn get(&mut self, i: &mut arg::Iter<'_>) -> Result<(), arg::TypeMismatchError> {
         self.sink = r#try!(i.read());
         Ok(())
     }
@@ -137,9 +137,9 @@ pub struct OrgPulseAudioExtEqualizing1ManagerProfilesChanged {
 impl dbus::SignalArgs for OrgPulseAudioExtEqualizing1ManagerProfilesChanged {
     const NAME: &'static str = "ProfilesChanged";
     const INTERFACE: &'static str = "org.PulseAudio.Ext.Equalizing1.Manager";
-    fn append(&self, _: &mut arg::IterAppend) {
+    fn append(&self, _: &mut arg::IterAppend<'_>) {
     }
-    fn get(&mut self, _: &mut arg::Iter) -> Result<(), arg::TypeMismatchError> {
+    fn get(&mut self, _: &mut arg::Iter<'_>) -> Result<(), arg::TypeMismatchError> {
         Ok(())
     }
 }
@@ -167,12 +167,12 @@ where
     D: tree::DataType,
     D::Method: Default,
     T: OrgFreedesktopDBusIntrospectable<Err=tree::MethodErr>,
-    F: 'static + for <'z> Fn(& 'z tree::MethodInfo<tree::MTFn<D>, D>) -> & 'z T,
+    F: 'static + for <'z> Fn(& 'z tree::MethodInfo<'_, tree::MTFn<D>, 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<tree::MTFn<D>, D>| {
+    let h = move |minfo: &tree::MethodInfo<'_, tree::MTFn<D>, D>| {
         let d = fclone(minfo);
         let data = r#try!(d.introspect());
         let rm = minfo.msg.method_return();
@@ -187,15 +187,15 @@ where
 
 pub trait OrgFreedesktopDBusProperties {
     type Err;
-    fn get(&self, interface_name: &str, property_name: &str) -> Result<arg::Variant<Box<arg::RefArg>>, Self::Err>;
-    fn set(&self, interface_name: &str, property_name: &str, value: arg::Variant<Box<arg::RefArg>>) -> Result<(), Self::Err>;
-    fn get_all(&self, interface_name: &str) -> Result<::std::collections::HashMap<String, arg::Variant<Box<arg::RefArg>>>, Self::Err>;
+    fn get(&self, interface_name: &str, property_name: &str) -> Result<arg::Variant<Box<dyn arg::RefArg>>, Self::Err>;
+    fn set(&self, interface_name: &str, property_name: &str, value: arg::Variant<Box<dyn arg::RefArg>>) -> Result<(), Self::Err>;
+    fn get_all(&self, interface_name: &str) -> Result<::std::collections::HashMap<String, arg::Variant<Box<dyn arg::RefArg>>>, Self::Err>;
 }
 
 impl<'a, C: ::std::ops::Deref<Target=dbus::Connection>> OrgFreedesktopDBusProperties for dbus::ConnPath<'a, C> {
     type Err = dbus::Error;
 
-    fn get(&self, interface_name: &str, property_name: &str) -> Result<arg::Variant<Box<arg::RefArg>>, Self::Err> {
+    fn get(&self, interface_name: &str, property_name: &str) -> Result<arg::Variant<Box<dyn arg::RefArg>>, 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);
@@ -203,11 +203,11 @@ impl<'a, C: ::std::ops::Deref<Target=dbus::Connection>> OrgFreedesktopDBusProper
         }));
         r#try!(m.as_result());
         let mut i = m.iter_init();
-        let value: arg::Variant<Box<arg::RefArg>> = r#try!(i.read());
+        let value: arg::Variant<Box<dyn arg::RefArg>> = r#try!(i.read());
         Ok(value)
     }
 
-    fn set(&self, interface_name: &str, property_name: &str, value: arg::Variant<Box<arg::RefArg>>) -> Result<(), Self::Err> {
+    fn set(&self, interface_name: &str, property_name: &str, value: arg::Variant<Box<dyn arg::RefArg>>) -> 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);
@@ -218,14 +218,14 @@ impl<'a, C: ::std::ops::Deref<Target=dbus::Connection>> OrgFreedesktopDBusProper
         Ok(())
     }
 
-    fn get_all(&self, interface_name: &str) -> Result<::std::collections::HashMap<String, arg::Variant<Box<arg::RefArg>>>, Self::Err> {
+    fn get_all(&self, interface_name: &str) -> Result<::std::collections::HashMap<String, arg::Variant<Box<dyn arg::RefArg>>>, 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<String, arg::Variant<Box<arg::RefArg>>> = r#try!(i.read());
+        let props: ::std::collections::HashMap<String, arg::Variant<Box<dyn arg::RefArg>>> = r#try!(i.read());
         Ok(props)
     }
 }
@@ -235,12 +235,12 @@ where
     D: tree::DataType,
     D::Method: Default,
     T: OrgFreedesktopDBusProperties<Err=tree::MethodErr>,
-    F: 'static + for <'z> Fn(& 'z tree::MethodInfo<tree::MTFn<D>, D>) -> & 'z T,
+    F: 'static + for <'z> Fn(& 'z tree::MethodInfo<'_, tree::MTFn<D>, 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<tree::MTFn<D>, D>| {
+    let h = move |minfo: &tree::MethodInfo<'_, tree::MTFn<D>, D>| {
         let mut i = minfo.msg.iter_init();
         let interface_name: &str = r#try!(i.read());
         let property_name: &str = r#try!(i.read());
@@ -257,11 +257,11 @@ where
     let i = i.add_m(m);
 
     let fclone = f.clone();
-    let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
+    let h = move |minfo: &tree::MethodInfo<'_, tree::MTFn<D>, 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<Box<arg::RefArg>> = r#try!(i.read());
+        let value: arg::Variant<Box<dyn arg::RefArg>> = r#try!(i.read());
         let d = fclone(minfo);
         r#try!(d.set(interface_name, property_name, value));
         let rm = minfo.msg.method_return();
@@ -274,7 +274,7 @@ where
     let i = i.add_m(m);
 
     let fclone = f.clone();
-    let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
+    let h = move |minfo: &tree::MethodInfo<'_, tree::MTFn<D>, D>| {
         let mut i = minfo.msg.iter_init();
         let interface_name: &str = r#try!(i.read());
         let d = fclone(minfo);
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<Err=tree::MethodErr>,
-    F: 'static + for <'z> Fn(& 'z tree::MethodInfo<tree::MTFn<D>, D>) -> & 'z T,
+    F: 'static + for <'z> Fn(& 'z tree::MethodInfo<'_, tree::MTFn<D>, 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<Err=tree::MethodErr>,
-    F: 'static + for <'z> Fn(& 'z tree::MethodInfo<tree::MTFn<D>, D>) -> & 'z T,
+    F: 'static + for <'z> Fn(& 'z tree::MethodInfo<'_, tree::MTFn<D>, 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<tree::MTFn<D>, D>| {
+    let h = move |minfo: &tree::MethodInfo<'_, tree::MTFn<D>, 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<arg::Variant<Box<arg::RefArg>>, Self::Err>;
-    fn set(&self, interface_name: &str, property_name: &str, value: arg::Variant<Box<arg::RefArg>>) -> Result<(), Self::Err>;
-    fn get_all(&self, interface_name: &str) -> Result<::std::collections::HashMap<String, arg::Variant<Box<arg::RefArg>>>, Self::Err>;
+    fn get(&self, interface_name: &str, property_name: &str) -> Result<arg::Variant<Box<dyn arg::RefArg>>, Self::Err>;
+    fn set(&self, interface_name: &str, property_name: &str, value: arg::Variant<Box<dyn arg::RefArg>>) -> Result<(), Self::Err>;
+    fn get_all(&self, interface_name: &str) -> Result<::std::collections::HashMap<String, arg::Variant<Box<dyn arg::RefArg>>>, Self::Err>;
 }
 
 impl<'a, C: ::std::ops::Deref<Target=dbus::Connection>> OrgFreedesktopDBusProperties for dbus::ConnPath<'a, C> {
     type Err = dbus::Error;
 
-    fn get(&self, interface_name: &str, property_name: &str) -> Result<arg::Variant<Box<arg::RefArg>>, Self::Err> {
+    fn get(&self, interface_name: &str, property_name: &str) -> Result<arg::Variant<Box<dyn arg::RefArg>>, 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<Target=dbus::Connection>> OrgFreedesktopDBusProper
         }));
         r#try!(m.as_result());
         let mut i = m.iter_init();
-        let value: arg::Variant<Box<arg::RefArg>> = r#try!(i.read());
+        let value: arg::Variant<Box<dyn arg::RefArg>> = r#try!(i.read());
         Ok(value)
     }
 
-    fn set(&self, interface_name: &str, property_name: &str, value: arg::Variant<Box<arg::RefArg>>) -> Result<(), Self::Err> {
+    fn set(&self, interface_name: &str, property_name: &str, value: arg::Variant<Box<dyn arg::RefArg>>) -> 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<Target=dbus::Connection>> OrgFreedesktopDBusProper
         Ok(())
     }
 
-    fn get_all(&self, interface_name: &str) -> Result<::std::collections::HashMap<String, arg::Variant<Box<arg::RefArg>>>, Self::Err> {
+    fn get_all(&self, interface_name: &str) -> Result<::std::collections::HashMap<String, arg::Variant<Box<dyn arg::RefArg>>>, 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<String, arg::Variant<Box<arg::RefArg>>> = r#try!(i.read());
+        let props: ::std::collections::HashMap<String, arg::Variant<Box<dyn arg::RefArg>>> = r#try!(i.read());
         Ok(props)
     }
 }
@@ -132,12 +132,12 @@ where
     D: tree::DataType,
     D::Method: Default,
     T: OrgFreedesktopDBusProperties<Err=tree::MethodErr>,
-    F: 'static + for <'z> Fn(& 'z tree::MethodInfo<tree::MTFn<D>, D>) -> & 'z T,
+    F: 'static + for <'z> Fn(& 'z tree::MethodInfo<'_, tree::MTFn<D>, 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<tree::MTFn<D>, D>| {
+    let h = move |minfo: &tree::MethodInfo<'_, tree::MTFn<D>, 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<tree::MTFn<D>, D>| {
+    let h = move |minfo: &tree::MethodInfo<'_, tree::MTFn<D>, 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<Box<arg::RefArg>> = r#try!(i.read());
+        let value: arg::Variant<Box<dyn arg::RefArg>> = 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<tree::MTFn<D>, D>| {
+    let h = move |minfo: &tree::MethodInfo<'_, tree::MTFn<D>, D>| {
         let mut i = minfo.msg.iter_init();
         let interface_name: &str = r#try!(i.read());
         let d = fclone(minfo);
diff --git a/src/pa_eq/dbus_api/sink.rs b/src/pa_eq/dbus_api/sink.rs
index 6d8bfb7..d902e64 100644
--- a/src/pa_eq/dbus_api/sink.rs
+++ b/src/pa_eq/dbus_api/sink.rs
@@ -138,12 +138,12 @@ where
     D::Method: Default,
     D::Property: Default,
     T: OrgPulseAudioExtEqualizing1Equalizer<Err=tree::MethodErr>,
-    F: 'static + for <'z> Fn(& 'z tree::MethodInfo<tree::MTFn<D>, D>) -> & 'z T,
+    F: 'static + for <'z> Fn(& 'z tree::MethodInfo<'_, tree::MTFn<D>, D>) -> & 'z T,
 {
     let i = factory.interface("org.PulseAudio.Ext.Equalizing1.Equalizer", data);
     let f = ::std::sync::Arc::new(f);
     let fclone = f.clone();
-    let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
+    let h = move |minfo: &tree::MethodInfo<'_, tree::MTFn<D>, D>| {
         let mut i = minfo.msg.iter_init();
         let channel: u32 = r#try!(i.read());
         let xs: Vec<u32> = r#try!(i.read());
@@ -162,7 +162,7 @@ where
     let i = i.add_m(m);
 
     let fclone = f.clone();
-    let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
+    let h = move |minfo: &tree::MethodInfo<'_, tree::MTFn<D>, D>| {
         let mut i = minfo.msg.iter_init();
         let channel: u32 = r#try!(i.read());
         let xs: Vec<u32> = r#try!(i.read());
@@ -181,7 +181,7 @@ where
     let i = i.add_m(m);
 
     let fclone = f.clone();
-    let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
+    let h = move |minfo: &tree::MethodInfo<'_, tree::MTFn<D>, D>| {
         let mut i = minfo.msg.iter_init();
         let channel: u32 = r#try!(i.read());
         let name: &str = r#try!(i.read());
@@ -196,7 +196,7 @@ where
     let i = i.add_m(m);
 
     let fclone = f.clone();
-    let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
+    let h = move |minfo: &tree::MethodInfo<'_, tree::MTFn<D>, D>| {
         let mut i = minfo.msg.iter_init();
         let channel: u32 = r#try!(i.read());
         let name: &str = r#try!(i.read());
@@ -211,7 +211,7 @@ where
     let i = i.add_m(m);
 
     let fclone = f.clone();
-    let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
+    let h = move |minfo: &tree::MethodInfo<'_, tree::MTFn<D>, D>| {
         let mut i = minfo.msg.iter_init();
         let channel: u32 = r#try!(i.read());
         let ys: Vec<f64> = r#try!(i.read());
@@ -228,7 +228,7 @@ where
     let i = i.add_m(m);
 
     let fclone = f.clone();
-    let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
+    let h = move |minfo: &tree::MethodInfo<'_, tree::MTFn<D>, D>| {
         let mut i = minfo.msg.iter_init();
         let channel: u32 = r#try!(i.read());
         let d = fclone(minfo);
@@ -245,7 +245,7 @@ where
     let i = i.add_m(m);
 
     let fclone = f.clone();
-    let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
+    let h = move |minfo: &tree::MethodInfo<'_, tree::MTFn<D>, D>| {
         let d = fclone(minfo);
         r#try!(d.save_state());
         let rm = minfo.msg.method_return();
@@ -255,7 +255,7 @@ where
     let i = i.add_m(m);
 
     let fclone = f.clone();
-    let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
+    let h = move |minfo: &tree::MethodInfo<'_, tree::MTFn<D>, D>| {
         let mut i = minfo.msg.iter_init();
         let channel: u32 = r#try!(i.read());
         let d = fclone(minfo);
@@ -333,9 +333,9 @@ pub struct OrgPulseAudioExtEqualizing1EqualizerFilterChanged {
 impl dbus::SignalArgs for OrgPulseAudioExtEqualizing1EqualizerFilterChanged {
     const NAME: &'static str = "FilterChanged";
     const INTERFACE: &'static str = "org.PulseAudio.Ext.Equalizing1.Equalizer";
-    fn append(&self, _: &mut arg::IterAppend) {
+    fn append(&self, _: &mut arg::IterAppend<'_>) {
     }
-    fn get(&mut self, _: &mut arg::Iter) -> Result<(), arg::TypeMismatchError> {
+    fn get(&mut self, _: &mut arg::Iter<'_>) -> Result<(), arg::TypeMismatchError> {
         Ok(())
     }
 }
@@ -347,9 +347,9 @@ pub struct OrgPulseAudioExtEqualizing1EqualizerSinkReconfigured {
 impl dbus::SignalArgs for OrgPulseAudioExtEqualizing1EqualizerSinkReconfigured {
     const NAME: &'static str = "SinkReconfigured";
     const INTERFACE: &'static str = "org.PulseAudio.Ext.Equalizing1.Equalizer";
-    fn append(&self, _: &mut arg::IterAppend) {
+    fn append(&self, _: &mut arg::IterAppend<'_>) {
     }
-    fn get(&mut self, _: &mut arg::Iter) -> Result<(), arg::TypeMismatchError> {
+    fn get(&mut self, _: &mut arg::Iter<'_>) -> Result<(), arg::TypeMismatchError> {
         Ok(())
     }
 }
@@ -530,12 +530,12 @@ where
     D::Method: Default,
     D::Property: Default,
     T: OrgPulseAudioCore1Device<Err=tree::MethodErr>,
-    F: 'static + for <'z> Fn(& 'z tree::MethodInfo<tree::MTFn<D>, D>) -> & 'z T,
+    F: 'static + for <'z> Fn(& 'z tree::MethodInfo<'_, tree::MTFn<D>, D>) -> & 'z T,
 {
     let i = factory.interface("org.PulseAudio.Core1.Device", data);
     let f = ::std::sync::Arc::new(f);
     let fclone = f.clone();
-    let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
+    let h = move |minfo: &tree::MethodInfo<'_, tree::MTFn<D>, D>| {
         let mut i = minfo.msg.iter_init();
         let suspend: bool = r#try!(i.read());
         let d = fclone(minfo);
@@ -548,7 +548,7 @@ where
     let i = i.add_m(m);
 
     let fclone = f.clone();
-    let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
+    let h = move |minfo: &tree::MethodInfo<'_, tree::MTFn<D>, D>| {
         let mut i = minfo.msg.iter_init();
         let name: &str = r#try!(i.read());
         let d = fclone(minfo);
@@ -595,7 +595,7 @@ where
     });
     let i = i.add_p(p);
 
-    let p = factory.property::<dbus::Path, _>("OwnerModule", Default::default());
+    let p = factory.property::<dbus::Path<'_>, _>("OwnerModule", Default::default());
     let p = p.access(tree::Access::Read);
     let fclone = f.clone();
     let p = p.on_get(move |a, pinfo| {
@@ -606,7 +606,7 @@ where
     });
     let i = i.add_p(p);
 
-    let p = factory.property::<dbus::Path, _>("Card", Default::default());
+    let p = factory.property::<dbus::Path<'_>, _>("Card", Default::default());
     let p = p.access(tree::Access::Read);
     let fclone = f.clone();
     let p = p.on_get(move |a, pinfo| {
@@ -818,7 +818,7 @@ where
     });
     let i = i.add_p(p);
 
-    let p = factory.property::<Vec<dbus::Path>, _>("Ports", Default::default());
+    let p = factory.property::<Vec<dbus::Path<'_>>, _>("Ports", Default::default());
     let p = p.access(tree::Access::Read);
     let fclone = f.clone();
     let p = p.on_get(move |a, pinfo| {
@@ -829,7 +829,7 @@ where
     });
     let i = i.add_p(p);
 
-    let p = factory.property::<dbus::Path, _>("ActivePort", Default::default());
+    let p = factory.property::<dbus::Path<'_>, _>("ActivePort", Default::default());
     let p = p.access(tree::Access::ReadWrite);
     let fclone = f.clone();
     let p = p.on_get(move |a, pinfo| {
@@ -868,10 +868,10 @@ pub struct OrgPulseAudioCore1DeviceVolumeUpdated {
 impl dbus::SignalArgs for OrgPulseAudioCore1DeviceVolumeUpdated {
     const NAME: &'static str = "VolumeUpdated";
     const INTERFACE: &'static str = "org.PulseAudio.Core1.Device";
-    fn append(&self, i: &mut arg::IterAppend) {
-        (&self.volume as &arg::RefArg).append(i);
+    fn append(&self, i: &mut arg::IterAppend<'_>) {
+        (&self.volume as &dyn arg::RefArg).append(i);
     }
-    fn get(&mut self, i: &mut arg::Iter) -> Result<(), arg::TypeMismatchError> {
+    fn get(&mut self, i: &mut arg::Iter<'_>) -> Result<(), arg::TypeMismatchError> {
         self.volume = r#try!(i.read());
         Ok(())
     }
@@ -885,10 +885,10 @@ pub struct OrgPulseAudioCore1DeviceMuteUpdated {
 impl dbus::SignalArgs for OrgPulseAudioCore1DeviceMuteUpdated {
     const NAME: &'static str = "MuteUpdated";
     const INTERFACE: &'static str = "org.PulseAudio.Core1.Device";
-    fn append(&self, i: &mut arg::IterAppend) {
-        (&self.muted as &arg::RefArg).append(i);
+    fn append(&self, i: &mut arg::IterAppend<'_>) {
+        (&self.muted as &dyn arg::RefArg).append(i);
     }
-    fn get(&mut self, i: &mut arg::Iter) -> Result<(), arg::TypeMismatchError> {
+    fn get(&mut self, i: &mut arg::Iter<'_>) -> Result<(), arg::TypeMismatchError> {
         self.muted = r#try!(i.read());
         Ok(())
     }
@@ -902,10 +902,10 @@ pub struct OrgPulseAudioCore1DeviceStateUpdated {
 impl dbus::SignalArgs for OrgPulseAudioCore1DeviceStateUpdated {
     const NAME: &'static str = "StateUpdated";
     const INTERFACE: &'static str = "org.PulseAudio.Core1.Device";
-    fn append(&self, i: &mut arg::IterAppend) {
-        (&self.state as &arg::RefArg).append(i);
+    fn append(&self, i: &mut arg::IterAppend<'_>) {
+        (&self.state as &dyn arg::RefArg).append(i);
     }
-    fn get(&mut self, i: &mut arg::Iter) -> Result<(), arg::TypeMismatchError> {
+    fn get(&mut self, i: &mut arg::Iter<'_>) -> Result<(), arg::TypeMismatchError> {
         self.state = r#try!(i.read());
         Ok(())
     }
@@ -919,10 +919,10 @@ pub struct OrgPulseAudioCore1DeviceActivePortUpdated {
 impl dbus::SignalArgs for OrgPulseAudioCore1DeviceActivePortUpdated {
     const NAME: &'static str = "ActivePortUpdated";
     const INTERFACE: &'static str = "org.PulseAudio.Core1.Device";
-    fn append(&self, i: &mut arg::IterAppend) {
-        (&self.port as &arg::RefArg).append(i);
+    fn append(&self, i: &mut arg::IterAppend<'_>) {
+        (&self.port as &dyn arg::RefArg).append(i);
     }
-    fn get(&mut self, i: &mut arg::Iter) -> Result<(), arg::TypeMismatchError> {
+    fn get(&mut self, i: &mut arg::Iter<'_>) -> Result<(), arg::TypeMismatchError> {
         self.port = r#try!(i.read());
         Ok(())
     }
@@ -936,10 +936,10 @@ pub struct OrgPulseAudioCore1DevicePropertyListUpdated {
 impl dbus::SignalArgs for OrgPulseAudioCore1DevicePropertyListUpdated {
     const NAME: &'static str = "PropertyListUpdated";
     const INTERFACE: &'static str = "org.PulseAudio.Core1.Device";
-    fn append(&self, i: &mut arg::IterAppend) {
-        (&self.property_list as &arg::RefArg).append(i);
+    fn append(&self, i: &mut arg::IterAppend<'_>) {
+        (&self.property_list as &dyn arg::RefArg).append(i);
     }
-    fn get(&mut self, i: &mut arg::Iter) -> Result<(), arg::TypeMismatchError> {
+    fn get(&mut self, i: &mut arg::Iter<'_>) -> Result<(), arg::TypeMismatchError> {
         self.property_list = r#try!(i.read());
         Ok(())
     }
@@ -964,11 +964,11 @@ where
     D::Method: Default,
     D::Property: Default,
     T: OrgPulseAudioCore1Sink<Err=tree::MethodErr>,
-    F: 'static + for <'z> Fn(& 'z tree::MethodInfo<tree::MTFn<D>, D>) -> & 'z T,
+    F: 'static + for <'z> Fn(& 'z tree::MethodInfo<'_, tree::MTFn<D>, D>) -> & 'z T,
 {
     let i = factory.interface("org.PulseAudio.Core1.Sink", data);
     let f = ::std::sync::Arc::new(f);
-    let p = factory.property::<dbus::Path, _>("MonitorSource", Default::default());
+    let p = factory.property::<dbus::Path<'_>, _>("MonitorSource", Default::default());
     let p = p.access(tree::Access::Read);
     let fclone = f.clone();
     let p = p.on_get(move |a, pinfo| {
@@ -1004,12 +1004,12 @@ where
     D: tree::DataType,
     D::Method: Default,
     T: OrgFreedesktopDBusIntrospectable<Err=tree::MethodErr>,
-    F: 'static + for <'z> Fn(& 'z tree::MethodInfo<tree::MTFn<D>, D>) -> & 'z T,
+    F: 'static + for <'z> Fn(& 'z tree::MethodInfo<'_, tree::MTFn<D>, 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<tree::MTFn<D>, D>| {
+    let h = move |minfo: &tree::MethodInfo<'_, tree::MTFn<D>, D>| {
         let d = fclone(minfo);
         let data = r#try!(d.introspect());
         let rm = minfo.msg.method_return();
@@ -1024,15 +1024,15 @@ where
 
 pub trait OrgFreedesktopDBusProperties {
     type Err;
-    fn get(&self, interface_name: &str, property_name: &str) -> Result<arg::Variant<Box<arg::RefArg>>, Self::Err>;
-    fn set(&self, interface_name: &str, property_name: &str, value: arg::Variant<Box<arg::RefArg>>) -> Result<(), Self::Err>;
-    fn get_all(&self, interface_name: &str) -> Result<::std::collections::HashMap<String, arg::Variant<Box<arg::RefArg>>>, Self::Err>;
+    fn get(&self, interface_name: &str, property_name: &str) -> Result<arg::Variant<Box<dyn arg::RefArg>>, Self::Err>;
+    fn set(&self, interface_name: &str, property_name: &str, value: arg::Variant<Box<dyn arg::RefArg>>) -> Result<(), Self::Err>;
+    fn get_all(&self, interface_name: &str) -> Result<::std::collections::HashMap<String, arg::Variant<Box<dyn arg::RefArg>>>, Self::Err>;
 }
 
 impl<'a, C: ::std::ops::Deref<Target=dbus::Connection>> OrgFreedesktopDBusProperties for dbus::ConnPath<'a, C> {
     type Err = dbus::Error;
 
-    fn get(&self, interface_name: &str, property_name: &str) -> Result<arg::Variant<Box<arg::RefArg>>, Self::Err> {
+    fn get(&self, interface_name: &str, property_name: &str) -> Result<arg::Variant<Box<dyn arg::RefArg>>, 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);
@@ -1040,11 +1040,11 @@ impl<'a, C: ::std::ops::Deref<Target=dbus::Connection>> OrgFreedesktopDBusProper
         }));
         r#try!(m.as_result());
         let mut i = m.iter_init();
-        let value: arg::Variant<Box<arg::RefArg>> = r#try!(i.read());
+        let value: arg::Variant<Box<dyn arg::RefArg>> = r#try!(i.read());
         Ok(value)
     }
 
-    fn set(&self, interface_name: &str, property_name: &str, value: arg::Variant<Box<arg::RefArg>>) -> Result<(), Self::Err> {
+    fn set(&self, interface_name: &str, property_name: &str, value: arg::Variant<Box<dyn arg::RefArg>>) -> 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);
@@ -1055,14 +1055,14 @@ impl<'a, C: ::std::ops::Deref<Target=dbus::Connection>> OrgFreedesktopDBusProper
         Ok(())
     }
 
-    fn get_all(&self, interface_name: &str) -> Result<::std::collections::HashMap<String, arg::Variant<Box<arg::RefArg>>>, Self::Err> {
+    fn get_all(&self, interface_name: &str) -> Result<::std::collections::HashMap<String, arg::Variant<Box<dyn arg::RefArg>>>, 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<String, arg::Variant<Box<arg::RefArg>>> = r#try!(i.read());
+        let props: ::std::collections::HashMap<String, arg::Variant<Box<dyn arg::RefArg>>> = r#try!(i.read());
         Ok(props)
     }
 }
@@ -1072,12 +1072,12 @@ where
     D: tree::DataType,
     D::Method: Default,
     T: OrgFreedesktopDBusProperties<Err=tree::MethodErr>,
-    F: 'static + for <'z> Fn(& 'z tree::MethodInfo<tree::MTFn<D>, D>) -> & 'z T,
+    F: 'static + for <'z> Fn(& 'z tree::MethodInfo<'_, tree::MTFn<D>, 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<tree::MTFn<D>, D>| {
+    let h = move |minfo: &tree::MethodInfo<'_, tree::MTFn<D>, D>| {
         let mut i = minfo.msg.iter_init();
         let interface_name: &str = r#try!(i.read());
         let property_name: &str = r#try!(i.read());
@@ -1094,11 +1094,11 @@ where
     let i = i.add_m(m);
 
     let fclone = f.clone();
-    let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
+    let h = move |minfo: &tree::MethodInfo<'_, tree::MTFn<D>, 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<Box<arg::RefArg>> = r#try!(i.read());
+        let value: arg::Variant<Box<dyn arg::RefArg>> = r#try!(i.read());
         let d = fclone(minfo);
         r#try!(d.set(interface_name, property_name, value));
         let rm = minfo.msg.method_return();
@@ -1111,7 +1111,7 @@ where
     let i = i.add_m(m);
 
     let fclone = f.clone();
-    let h = move |minfo: &tree::MethodInfo<tree::MTFn<D>, D>| {
+    let h = move |minfo: &tree::MethodInfo<'_, tree::MTFn<D>, D>| {
         let mut i = minfo.msg.iter_init();
         let interface_name: &str = r#try!(i.read());
         let d = fclone(minfo);
diff --git a/src/pa_eq/mod.rs b/src/pa_eq/mod.rs
index 9073684..09b2039 100644
--- a/src/pa_eq/mod.rs
+++ b/src/pa_eq/mod.rs
@@ -69,13 +69,13 @@ fn connect_impl() -> Result<Connection, Error> {
     Ok(Connection::open_private(&pulse_sock_path)?)
 }
 
-fn get_equalized_sink(conn: &Connection) -> Result<ConnPath<&Connection>, Error> {
+fn get_equalized_sink(conn: &Connection) -> Result<ConnPath<'_, &Connection>, Error> {
     Ok(get_equalized_sink_impl(conn).context(
         "Could not find an equalized sink. Have you loaded the 'module-equalizer-sink' module?",
     )?)
 }
 
-fn get_equalized_sink_impl(conn: &Connection) -> Result<ConnPath<&Connection>, Error> {
+fn get_equalized_sink_impl(conn: &Connection) -> Result<ConnPath<'_, &Connection>, Error> {
     let conn_manager = conn.with_path("org.PulseAudio.Core1", "/org/pulseaudio/equalizing1", 2000);
 
     // TODO: make that a command-line option
@@ -88,7 +88,7 @@ fn get_equalized_sink_impl(conn: &Connection) -> Result<ConnPath<&Connection>, E
     Ok(conn.with_path("org.PulseAudio.Core1", sink_path, 2000))
 }
 
-fn send_filter(conn_sink: &ConnPath<&Connection>, filter: Filter) -> Result<(), Error> {
+fn send_filter(conn_sink: &ConnPath<'_, &Connection>, filter: Filter) -> Result<(), Error> {
     let channel = conn_sink.get_nchannels()?;
     info!("Using channel: {}", channel);
     trace!("Sending filter: {:?}", filter);