Fix "mismatched types" errors from new nix version

cakebaker · cakebaker · commit 0223da965e5e · 2024-03-11T16:02:46.000+01:00
diff --git a/src/uu/cat/src/splice.rs b/src/uu/cat/src/splice.rs
@@ -5,7 +5,13 @@
 use super::{CatResult, FdReadable, InputHandle};
 
 use nix::unistd;
-use std::os::unix::io::{AsRawFd, RawFd};
+use std::{
+    fs::File,
+    os::{
+        fd::FromRawFd,
+        unix::io::{AsRawFd, RawFd},
+    },
+};
 
 use uucore::pipes::{pipe, splice, splice_exact};
 
@@ -60,9 +66,11 @@ fn copy_exact(read_fd: RawFd, write_fd: RawFd, num_bytes: usize) -> nix::Result<
         assert_ne!(read, 0, "unexpected end of pipe");
         let mut written = 0;
         while written < read {
-            match unistd::write(write_fd, &buf[written..read])? {
-                0 => panic!(),
-                n => written += n,
+            unsafe {
+                match unistd::write(File::from_raw_fd(write_fd), &buf[written..read])? {
+                    0 => panic!(),
+                    n => written += n,
+                }
             }
         }
         left -= read;
diff --git a/src/uucore/src/lib/features/pipes.rs b/src/uucore/src/lib/features/pipes.rs
@@ -8,7 +8,6 @@ use std::fs::File;
 use std::io::IoSlice;
 #[cfg(any(target_os = "linux", target_os = "android"))]
 use std::os::unix::io::AsRawFd;
-use std::os::unix::io::FromRawFd;
 
 #[cfg(any(target_os = "linux", target_os = "android"))]
 use nix::fcntl::SpliceFFlags;
@@ -21,8 +20,7 @@ pub use nix::{Error, Result};
 /// from the first.
 pub fn pipe() -> Result<(File, File)> {
     let (read, write) = nix::unistd::pipe()?;
-    // SAFETY: The file descriptors do not have other owners.
-    unsafe { Ok((File::from_raw_fd(read), File::from_raw_fd(write))) }
+    Ok((File::from(read), File::from(write)))
 }
 
 /// Less noisy wrapper around [`nix::fcntl::splice`].
