autocommit 2022-03-23 14:35:09 CET

src/utils/buffd/buf_out.rs

@@ -1,7 +1,7 @@
 use crate::async_engine::{AsyncFd, Timeout};
 use crate::utils::buffd::{BufFdError, BUF_SIZE, CMSG_BUF_SIZE};
-use futures::future::Fuse;
-use futures::{select, FutureExt};
+use futures_util::future::Fuse;
+use futures_util::{select, FutureExt};
 use std::collections::VecDeque;
 use std::mem::MaybeUninit;
 use std::rc::Rc;

src/utils/fdcloser.rs

@@ -1,7 +1,6 @@
-use parking_lot::{Condvar, Mutex};
 use std::mem;
 use std::rc::Rc;
-use std::sync::Arc;
+use std::sync::{Arc, Condvar, Mutex};
 use uapi::OwnedFd;
 
 pub struct FdCloser {
@@ -18,15 +17,15 @@ impl FdCloser {
         let slf2 = slf.clone();
         std::thread::spawn(move || {
             let mut fds = vec![];
-            let mut lock = slf2.fds.lock();
+            let mut lock = slf2.fds.lock().unwrap();
             loop {
                 mem::swap(&mut *lock, &mut fds);
                 if fds.len() > 0 {
                     drop(lock);
                     fds.clear();
-                    lock = slf2.fds.lock();
+                    lock = slf2.fds.lock().unwrap();
                 } else {
-                    slf2.cv.wait(&mut lock);
+                    lock = slf2.cv.wait(lock).unwrap();
                 }
             }
         });
@@ -36,7 +35,7 @@ impl FdCloser {
     pub fn close(&self, fd: Rc<OwnedFd>) {
         match Rc::try_unwrap(fd) {
             Ok(fd) => {
-                self.fds.lock().push(fd);
+                self.fds.lock().unwrap().push(fd);
                 self.cv.notify_all();
             }
             Err(_e) => {