Merge pull request #84 from containers/update-rustix10

Port to rustix 1.0

Author: cgwalters

Cargo.toml

@@ -14,7 +14,7 @@ futures-util = "0.3.13"
 # NOTE when bumping this in a semver-incompatible way, because we re-export it you
 # must also bump the semver of this project.
 oci-spec = "0.7.0"
-rustix = { version = "0.38", features = ["process", "net"] }
+rustix = { version = "1.0", features = ["process", "fs", "net"] }
 serde = { features = ["derive"], version = "1.0.125" }
 serde_json = "1.0.64"
 semver = "1.0.4"

src/imageproxy.rs

@@ -232,7 +232,7 @@ impl TryFrom<ImageProxyConfig> for Command {
             unsafe {
                 c.pre_exec(|| {
                     rustix::process::set_parent_process_death_signal(Some(
-                        rustix::process::Signal::Term,
+                        rustix::process::Signal::TERM,
                     ))
                     .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))
                 });
@@ -383,8 +383,9 @@ impl ImageProxy {
             rustix::net::send(sockfd, &sendbuf, rustix::net::SendFlags::empty())?;
             drop(sendbuf);
             let mut buf = [0u8; MAX_MSG_SIZE];
-            let mut cmsg_space = vec![0; rustix::cmsg_space!(ScmRights(1))];
-            let mut cmsg_buffer = rustix::net::RecvAncillaryBuffer::new(&mut cmsg_space);
+            let mut cmsg_space: Vec<std::mem::MaybeUninit<u8>> =
+                vec![std::mem::MaybeUninit::uninit(); rustix::cmsg_space!(ScmRights(1))];
+            let mut cmsg_buffer = rustix::net::RecvAncillaryBuffer::new(cmsg_space.as_mut_slice());
             let iov = std::io::IoSliceMut::new(buf.as_mut());
             let mut iov = [iov];
             let nread = rustix::net::recvmsg(