update to nix 0.24 / rustyline 9 / proxmox-sys 0.3

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

pbs-client/Cargo.toml

@@ -16,12 +16,12 @@ http = "0.2"
 hyper = { version = "0.14", features = [ "full" ] }
 lazy_static = "1.4"
 libc = "0.2"
-nix = "0.19.1"
+nix = "0.24"
 openssl = "0.10"
 percent-encoding = "2.1"
 pin-project-lite = "0.2"
 regex = "1.5"
-rustyline = "7"
+rustyline = "9"
 serde = "1.0"
 serde_json = "1.0"
 tokio = { version = "1.6", features = [ "fs", "signal" ] }
@@ -41,7 +41,7 @@ proxmox-lang = "1.1"
 proxmox-router = { version = "1.2", features = [ "cli" ] }
 proxmox-schema = "1.3.1"
 proxmox-time = "1"
-proxmox-sys = "0.2"
+proxmox-sys = "0.3"
 
 pxar = { version = "0.10.1", features = [ "tokio-io" ] }
 

pbs-client/src/pxar/create.rs

@@ -329,13 +329,13 @@ impl Archiver {
                 Mode::empty(),
             ) {
                 Ok(fd) => Ok(Some(fd)),
-                Err(nix::Error::Sys(Errno::ENOENT)) => {
+                Err(Errno::ENOENT) => {
                     if existed {
                         self.report_vanished_file()?;
                     }
                     Ok(None)
                 }
-                Err(nix::Error::Sys(Errno::EACCES)) => {
+                Err(Errno::EACCES) => {
                     writeln!(
                         self.errors,
                         "failed to open file: {:?}: access denied",
@@ -343,7 +343,7 @@ impl Archiver {
                     )?;
                     Ok(None)
                 }
-                Err(nix::Error::Sys(Errno::EPERM)) if !noatime.is_empty() => {
+                Err(Errno::EPERM) if !noatime.is_empty() => {
                     // Retry without O_NOATIME:
                     noatime = OFlag::empty();
                     continue;
@@ -899,7 +899,7 @@ fn get_chattr(metadata: &mut Metadata, fd: RawFd) -> Result<(), Error> {
 
     match unsafe { fs::read_attr_fd(fd, &mut attr) } {
         Ok(_) => (),
-        Err(nix::Error::Sys(errno)) if errno_is_unsupported(errno) => {
+        Err(errno) if errno_is_unsupported(errno) => {
             return Ok(());
         }
         Err(err) => bail!("failed to read file attributes: {}", err),
@@ -921,7 +921,7 @@ fn get_fat_attr(metadata: &mut Metadata, fd: RawFd, fs_magic: i64) -> Result<(),
 
     match unsafe { fs::read_fat_attr_fd(fd, &mut attr) } {
         Ok(_) => (),
-        Err(nix::Error::Sys(errno)) if errno_is_unsupported(errno) => {
+        Err(errno) if errno_is_unsupported(errno) => {
             return Ok(());
         }
         Err(err) => bail!("failed to read fat attributes: {}", err),
@@ -959,10 +959,7 @@ fn get_quota_project_id(
 
     // On some FUSE filesystems it can happen that ioctl is not supported.
     // For these cases projid is set to 0 while the error is ignored.
-    if let Err(err) = res {
-        let errno = err
-            .as_errno()
-            .ok_or_else(|| format_err!("error while reading quota project id"))?;
+    if let Err(errno) = res {
         if errno_is_unsupported(errno) {
             return Ok(());
         } else {

pbs-client/src/pxar/extract.rs

@@ -428,7 +428,7 @@ impl Extractor {
         if result.seeked_last {
             while match nix::unistd::ftruncate(file.as_raw_fd(), size as i64) {
                 Ok(_) => false,
-                Err(nix::Error::Sys(errno)) if errno == nix::errno::Errno::EINTR => true,
+                Err(errno) if errno == nix::errno::Errno::EINTR => true,
                 Err(err) => bail!("error setting file size: {}", err),
             } {}
         }
@@ -485,7 +485,7 @@ impl Extractor {
         if result.seeked_last {
             while match nix::unistd::ftruncate(file.as_raw_fd(), size as i64) {
                 Ok(_) => false,
-                Err(nix::Error::Sys(errno)) if errno == nix::errno::Errno::EINTR => true,
+                Err(errno) if errno == nix::errno::Errno::EINTR => true,
                 Err(err) => bail!("error setting file size: {}", err),
             } {}
         }

pbs-client/src/pxar/metadata.rs

@@ -372,7 +372,7 @@ fn apply_chattr(fd: RawFd, chattr: libc::c_long, mask: libc::c_long) -> Result<(
     let mut fattr: libc::c_long = 0;
     match unsafe { fs::read_attr_fd(fd, &mut fattr) } {
         Ok(_) => (),
-        Err(nix::Error::Sys(errno)) if errno_is_unsupported(errno) => {
+        Err(errno) if errno_is_unsupported(errno) => {
             return Ok(());
         }
         Err(err) => bail!("failed to read file attributes: {}", err),
@@ -386,7 +386,7 @@ fn apply_chattr(fd: RawFd, chattr: libc::c_long, mask: libc::c_long) -> Result<(
 
     match unsafe { fs::write_attr_fd(fd, &attr) } {
         Ok(_) => Ok(()),
-        Err(nix::Error::Sys(errno)) if errno_is_unsupported(errno) => Ok(()),
+        Err(errno) if errno_is_unsupported(errno) => Ok(()),
         Err(err) => bail!("failed to set file attributes: {}", err),
     }
 }
@@ -400,7 +400,7 @@ fn apply_flags(flags: Flags, fd: RawFd, entry_flags: u64) -> Result<(), Error> {
     if fatattr != 0 {
         match unsafe { fs::write_fat_attr_fd(fd, &fatattr) } {
             Ok(_) => (),
-            Err(nix::Error::Sys(errno)) if errno_is_unsupported(errno) => (),
+            Err(errno) if errno_is_unsupported(errno) => (),
             Err(err) => bail!("failed to set file FAT attributes: {}", err),
         }
     }

pbs-client/src/vsock_client.rs

@@ -72,7 +72,7 @@ impl tower_service::Service<Uri> for VsockConnector {
             )?;
 
             let sock_addr = VsockAddr::new(cid, port as u32);
-            connect(sock_fd, &SockAddr::Vsock(sock_addr))?;
+            connect(sock_fd, &sock_addr)?;
 
             // connect sync, but set nonblock after (tokio requires it)
             let std_stream = unsafe { std::os::unix::net::UnixStream::from_raw_fd(sock_fd) };