Update dependencies

* Bump anyhow to 1.0.60
* Bump libc to 0.2.127
* Bump nix to 0.24.2
* Bump pem to 1.1.0
* Bump serde to 1.0.142
* Bump serde_json to 1.0.83
* Bump time to 0.3.12
* Bump slab to 0.4.7

Signed-off-by: Florentin Dubois <florentin.dubois@clever-cloud.com>

bin/Cargo.toml

@@ -20,7 +20,7 @@ include = [
 name = "sozu"
 
 [dependencies]
-anyhow = "^1.0.59"
+anyhow = "^1.0.60"
 async-dup = "^1.2.2"
 async-io = "^1.7.0"
 clap = { version = "^3.2.16", features = ["derive"] }
@@ -29,19 +29,19 @@ futures-lite = "^1.12.0"
 hex = "^0.4.3"
 jemallocator = { version = "^0.5.0", optional = true }
 lazy_static = "^1.4.0"
-libc = "^0.2.126"
+libc = "^0.2.127"
 log = "^0.4.17"
 mio = { version = "^0.8.4", features = [ "os-poll", "net" ] }
-nix  = "^0.23.1"
+nix  = "^0.24.2"
 nom = "^7.1.1"
 paw = "^1.0.0"
 prettytable-rs = { version = "^0.8.0", default-features = false }
-serde = { version = "^1.0.139", features = ["derive"] }
-serde_json = "^1.0.82"
-time = "^0.3.11"
+serde = { version = "^1.0.142", features = ["derive"] }
+serde_json = "^1.0.83"
+time = "^0.3.12"
 rand = "^0.8.5"
 regex = "^1.6.0"
-slab = "^0.4.6"
+slab = "^0.4.7"
 smol = "^1.2.5"
 tempfile = "^3.3.0"
 termion = "^1.5.6"

command/Cargo.toml

@@ -21,21 +21,21 @@ include = [
 ]
 
 [dependencies]
-anyhow = "^1.0.59"
+anyhow = "^1.0.60"
 hex = "^0.4.3"
-libc = "^0.2.126"
+libc = "^0.2.127"
 log = "^0.4.17"
-time = "^0.3.11"
+time = "^0.3.12"
 toml = "^0.5.9"
 memchr = "^2.5.0"
 mio = { version = "^0.8.4", features = [ "os-poll", "net" ] }
-nix = "^0.23.1"
+nix = "^0.24.2"
 nom = "^7.1.1"
-pem = "^1.0.2"
+pem = "^1.1.0"
 regex = "^1.6.0"
 rand = "^0.8.5"
-serde = { version = "^1.0.139", features = ["derive"] }
-serde_json = "^1.0.82"
+serde = { version = "^1.0.142", features = ["derive"] }
+serde_json = "^1.0.83"
 sha2 = "^0.10.2"
 trailer = "^0.1.2"
 pool = "^0.1.4"

command/src/scm_socket.rs

@@ -4,11 +4,11 @@ use std::{
         io::{FromRawFd, IntoRawFd, RawFd},
         net,
     },
-    str::from_utf8,
+    str::from_utf8, io::{IoSlice, IoSliceMut},
 };
 
 use mio::net::TcpListener;
-use nix::{cmsg_space, sys::socket, sys::uio, Result as NixResult};
+use nix::{cmsg_space, sys::socket, Result as NixResult};
 use serde_json;
 
 pub const MAX_FDS_OUT: usize = 200;
@@ -133,8 +133,8 @@ impl ScmSocket {
         }
     }
 
-    pub fn send_msg(&self, bytes: &[u8], fds: &[RawFd]) -> NixResult<()> {
-        let iov = [uio::IoVec::from_slice(bytes)];
+    pub fn send_msg(&self, buf: &[u8], fds: &[RawFd]) -> NixResult<()> {
+        let iov = [IoSlice::new(buf)];
         let flags = if self.blocking {
             socket::MsgFlags::empty()
         } else {
@@ -144,17 +144,17 @@ impl ScmSocket {
         if !fds.is_empty() {
             let cmsgs = [socket::ControlMessage::ScmRights(fds)];
             //println!("{} send with data", self.fd);
-            socket::sendmsg(self.fd, &iov, &cmsgs, flags, None)?;
+            socket::sendmsg::<()>(self.fd, &iov, &cmsgs, flags, None)?;
         } else {
             //println!("{} send empty", self.fd);
-            socket::sendmsg(self.fd, &iov, &[], flags, None)?;
+            socket::sendmsg::<()>(self.fd, &iov, &[], flags, None)?;
         };
         Ok(())
     }
 
-    pub fn rcv_msg(&self, buffer: &mut [u8], fds: &mut [RawFd]) -> NixResult<(usize, usize)> {
+    pub fn rcv_msg(&self, buf: &mut [u8], fds: &mut [RawFd]) -> NixResult<(usize, usize)> {
         let mut cmsg = cmsg_space!([RawFd; MAX_FDS_OUT]);
-        let iov = [uio::IoVec::from_mut_slice(buffer)];
+        let mut iov = [IoSliceMut::new(buf)];
 
         let flags = if self.blocking {
             socket::MsgFlags::empty()
@@ -163,7 +163,7 @@ impl ScmSocket {
         };
 
         //let msg = socket::recvmsg(self.fd, &iov[..], Some(&mut cmsg), socket::MSG_DONTWAIT)?;
-        let msg = socket::recvmsg(self.fd, &iov[..], Some(&mut cmsg), flags)?;
+        let msg = socket::recvmsg::<()>(self.fd, &mut iov[..], Some(&mut cmsg), flags)?;
 
         let mut fd_count = 0;
         let received_fds = msg