From 5342bae38dc346506f88cf7413994e34071fffaf Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Wed, 14 Aug 2024 17:15:53 +0200 Subject: [PATCH] cat: adapt to API changes of uucore/pipes --- src/uu/cat/src/cat.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/uu/cat/src/cat.rs b/src/uu/cat/src/cat.rs index d0a33a171..44c4be0fd 100644 --- a/src/uu/cat/src/cat.rs +++ b/src/uu/cat/src/cat.rs @@ -13,7 +13,7 @@ use uucore::error::UResult; use uucore::fs::FileInformation; #[cfg(unix)] -use std::os::unix::io::AsRawFd; +use std::os::fd::{AsFd, AsRawFd}; /// Linux splice support #[cfg(any(target_os = "linux", target_os = "android"))] @@ -125,12 +125,12 @@ struct OutputState { } #[cfg(unix)] -trait FdReadable: Read + AsRawFd {} +trait FdReadable: Read + AsFd + AsRawFd {} #[cfg(not(unix))] trait FdReadable: Read {} #[cfg(unix)] -impl FdReadable for T where T: Read + AsRawFd {} +impl FdReadable for T where T: Read + AsFd + AsRawFd {} #[cfg(not(unix))] impl FdReadable for T where T: Read {}