tree-wide: use 'dyn' for all trait objects

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

src/tools/broadcast_future.rs

@@ -54,7 +54,7 @@ impl <T: Clone> BroadcastData<T> {
 
 /// Broadcast future results to registered listeners
 pub struct BroadcastFuture<T> {
-    inner: Arc<Mutex<(BroadcastData<T>, Option<Box<Future<Item=T, Error=Error> + Send>>)>>,
+    inner: Arc<Mutex<(BroadcastData<T>, Option<Box<dyn Future<Item=T, Error=Error> + Send>>)>>,
 }
 
 impl <T: Clone + Send + 'static> BroadcastFuture<T> {
@@ -62,7 +62,7 @@ impl <T: Clone + Send + 'static> BroadcastFuture<T> {
     /// Create instance for specified source future.
     ///
     /// The result of the future is sent to all registered listeners.
-    pub fn new(source: Box<Future<Item=T, Error=Error> + Send>) -> Self {
+    pub fn new(source: Box<dyn Future<Item=T, Error=Error> + Send>) -> Self {
         Self { inner: Arc::new(Mutex::new((BroadcastData::new(), Some(source)))) }
     }
 
@@ -76,12 +76,12 @@ impl <T: Clone + Send + 'static> BroadcastFuture<T> {
         (Self::new(test), tx)
     }
 
-    fn notify_listeners(inner: Arc<Mutex<(BroadcastData<T>, Option<Box<Future<Item=T, Error=Error> + Send>>)>>, result: Result<T, String>) {
+    fn notify_listeners(inner: Arc<Mutex<(BroadcastData<T>, Option<Box<dyn Future<Item=T, Error=Error> + Send>>)>>, result: Result<T, String>) {
         let mut data = inner.lock().unwrap();
         data.0.notify_listeners(result);
     }
 
-    fn spawn(inner: Arc<Mutex<(BroadcastData<T>,  Option<Box<Future<Item=T, Error=Error> + Send>>)>>) -> impl Future<Item=T, Error=Error> {
+    fn spawn(inner: Arc<Mutex<(BroadcastData<T>,  Option<Box<dyn Future<Item=T, Error=Error> + Send>>)>>) -> impl Future<Item=T, Error=Error> {
 
         let mut data = inner.lock().unwrap();
 

src/tools/fs.rs

@@ -76,7 +76,7 @@ impl ReadDirEntry {
 // This is simply a wrapper with a shorter type name mapping nix::Error to failure::Error.
 /// Wrapper over a pair of `nix::dir::Dir` and `nix::dir::Iter`, returned by `read_subdir()`.
 pub struct ReadDir {
-    iter: Tied<Dir, Iterator<Item = nix::Result<dir::Entry>> + Send>,
+    iter: Tied<Dir, dyn Iterator<Item = nix::Result<dir::Entry>> + Send>,
     dir_fd: RawFd,
 }
 
@@ -100,7 +100,8 @@ pub fn read_subdir<P: ?Sized + nix::NixPath>(dirfd: RawFd, path: &P) -> Result<R
     let dir = Dir::openat(dirfd, path, OFlag::O_RDONLY, Mode::empty())?;
     let fd = dir.as_raw_fd();
     let iter = Tied::new(dir, |dir| {
-        Box::new(unsafe { (*dir).iter() }) as Box<Iterator<Item = nix::Result<dir::Entry>> + Send>
+        Box::new(unsafe { (*dir).iter() })
+            as Box<dyn Iterator<Item = nix::Result<dir::Entry>> + Send>
     });
     Ok(ReadDir { iter, dir_fd: fd })
 }