Upgrade to rustix 1.0

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>

Author: SUPERCILEX

Cargo.lock

@@ -27,7 +27,7 @@ rand_xoshiro = "0.7.0"
 regex = "1.11.1"
 ringboard-sdk = { package = "clipboard-history-client-sdk", version = "0", path = "../client-sdk", features = ["error-stack", "deduplication", "search", "config"] }
 rustc-hash = "2.1.1"
-rustix = { version = "0.38.44", features = ["stdio", "event"] }
+rustix = { version = "1.0.0-prerelease.1", features = ["stdio", "event"] }
 serde = { version = "1.0.218", features = ["derive"] }
 serde_json = "1.0.139"
 thiserror = "2.0.11"

cli/Cargo.toml

@@ -18,7 +18,7 @@ memchr = { version = "2.7.4", optional = true }
 regex = { version = "1.11.1", optional = true }
 ringboard-core = { package = "clipboard-history-core", version = "0", path = "../core" }
 rustc-hash = { version = "2.1.1", optional = true }
-rustix = { version = "0.38.44", features = ["net", "fs", "thread"] }
+rustix = { version = "1.0.0-prerelease.1", features = ["net", "fs", "thread"] }
 serde = { version = "1.0.218", features = ["derive"], optional = true }
 smallvec = { version = "2.0.0-alpha.10", optional = true }
 thiserror = "2.0.11"

client-sdk/Cargo.toml

@@ -107,7 +107,7 @@ pub unsafe fn clipboard_history_client_sdk::api::MoveToFrontRequest::deref_mut<'
 pub unsafe fn clipboard_history_client_sdk::api::MoveToFrontRequest::drop(ptr: usize)
 pub unsafe fn clipboard_history_client_sdk::api::MoveToFrontRequest::init(init: <T as crossbeam_epoch::atomic::Pointable>::Init) -> usize
 impl<T> either::into_either::IntoEither for clipboard_history_client_sdk::api::MoveToFrontRequest
-#[repr(C)] pub struct clipboard_history_client_sdk::api::PasteCommand
+pub struct clipboard_history_client_sdk::api::PasteCommand
 pub clipboard_history_client_sdk::api::PasteCommand::id: u64
 pub clipboard_history_client_sdk::api::PasteCommand::mime: clipboard_history_core::protocol::MimeType
 pub clipboard_history_client_sdk::api::PasteCommand::trigger_paste: bool

client-sdk/api.golden

@@ -3,7 +3,7 @@ use std::{
     fs::File,
     io,
     io::{IoSlice, IoSliceMut, Seek, SeekFrom},
-    mem::ManuallyDrop,
+    mem::{ManuallyDrop, MaybeUninit},
     os::fd::{AsFd, AsRawFd, FromRawFd, OwnedFd},
 };
 
@@ -17,9 +17,9 @@ use ringboard_core::{
 use rustix::{
     fs::{AtFlags, CWD, FileType, Mode, OFlags, StatxFlags, statx},
     net::{
-        AddressFamily, RecvAncillaryBuffer, RecvFlags, SendAncillaryBuffer, SendAncillaryMessage,
-        SendFlags, SocketAddrUnix, SocketFlags, SocketType, connect_unix, recvmsg, sendmsg,
-        socket_with,
+        AddressFamily, RecvAncillaryBuffer, RecvFlags, ReturnFlags, SendAncillaryBuffer,
+        SendAncillaryMessage, SendFlags, SocketAddrUnix, SocketFlags, SocketType, connect, recvmsg,
+        sendmsg, socket_with,
     },
 };
 
@@ -58,7 +58,7 @@ pub fn connect_to_server_with(
 ) -> Result<OwnedFd, ClientError> {
     let socket = socket_with(AddressFamily::UNIX, SocketType::SEQPACKET, flags, None)
         .map_io_err(|| format!("Failed to create socket: {addr:?}"))?;
-    connect_unix(&socket, addr).map_io_err(|| format!("Failed to connect to server: {addr:?}"))?;
+    connect(&socket, addr).map_io_err(|| format!("Failed to connect to server: {addr:?}"))?;
 
     {
         sendmsg(
@@ -95,7 +95,7 @@ pub fn connect_to_paste_server(addr: &SocketAddrUnix) -> Result<OwnedFd, ClientE
         None,
     )
     .map_io_err(|| format!("Failed to create socket: {addr:?}"))?;
-    connect_unix(&sock, addr).map_io_err(|| format!("Failed to connect to server: {addr:?}"))?;
+    connect(&sock, addr).map_io_err(|| format!("Failed to connect to server: {addr:?}"))?;
     Ok(sock)
 }
 
@@ -121,7 +121,7 @@ pub fn send_paste_buffer(
     let file = entry.to_file(reader)?;
     let mime = file.mime_type()?;
 
-    let mut space = [0; rustix::cmsg_space!(ScmRights(1))];
+    let mut space = [MaybeUninit::uninit(); rustix::cmsg_space!(ScmRights(1))];
     let mut ancillary = SendAncillaryBuffer::new(&mut space);
     let fds = [file.as_fd()];
     {
@@ -336,7 +336,7 @@ fn request_with_fd(
     fd: impl AsFd,
     flags: SendFlags,
 ) -> Result<(), ClientError> {
-    let mut space = [0; rustix::cmsg_space!(ScmRights(1))];
+    let mut space = [MaybeUninit::uninit(); rustix::cmsg_space!(ScmRights(1))];
     let mut buf = SendAncillaryBuffer::new(&mut space);
     let fds = [fd.as_fd()];
     {
@@ -390,7 +390,7 @@ unsafe fn response<T: Copy + 'static, const N: usize>(
             context: format!("Bad {}.", type_name()).into(),
         });
     }
-    debug_assert!(!result.flags.contains(RecvFlags::TRUNC));
+    debug_assert!(!result.flags.contains(ReturnFlags::TRUNC));
 
     if TypeId::of::<T>() == TypeId::of::<VersionResponse>() {
         Ok(Response {

client-sdk/src/api.rs

@@ -303,12 +303,15 @@ pub fn xattr_mime_type<Fd: AsFd, MetadataFd: AsFd, MetadataPath: Arg + Copy + De
             .map_io_err(|| format!("Failed to read metadata file: {file_name:?}"))?;
     } else {
         let mut mime_type = mime_type.unfilled();
-        mime_type.ensure_init();
-        let len = match fgetxattr(fd, c"user.mime_type", mime_type.init_mut()) {
+        let len = match fgetxattr(fd, c"user.mime_type", mime_type.uninit_mut()) {
             Err(Errno::NODATA) => return Ok(MimeType::new_const()),
             r => r.map_io_err(|| "Failed to read extended attributes.")?,
-        };
-        mime_type.advance(len);
+        }
+        .0
+        .len();
+        unsafe {
+            mime_type.advance_unchecked(len);
+        }
     }
     let mime_type = str::from_utf8(mime_type.filled()).map_err(|e| ringboard_core::Error::Io {
         error: io::Error::new(ErrorKind::InvalidInput, e),

client-sdk/src/ring_reader.rs

@@ -14,7 +14,7 @@ arrayvec = "0.7.6"
 dirs = "6.0.0"
 error-stack = { version = "0.5.0", default-features = false, optional = true }
 itoa = "1.0.14"
-rustix = { version = "0.38.44", features = ["fs", "mm", "process", "net", "event", "itoa", "linux_latest"] }
+rustix = { version = "1.0.0-prerelease.1", features = ["fs", "mm", "process", "net", "event", "linux_latest"] }
 thiserror = "2.0.11"
 
 [dev-dependencies]