od: generalize RawReader

oech3 · cakebaker · commit c784046182f6 · 2026-05-10T16:16:39.000+02:00
diff --git a/src/uu/od/src/multifile_reader.rs b/src/uu/od/src/multifile_reader.rs
@@ -56,10 +56,12 @@ impl MultifileReader<'_> {
                     // limit.
                     #[cfg(any(unix, target_os = "wasi"))]
                     {
-                        struct RawReader<'a>(rustix::fd::BorrowedFd<'a>);
-                        impl io::Read for RawReader<'_> {
+                        use std::os::fd::AsFd;
+                        // todo: definition is generic enough to move to uucore::io::RawReader if useful
+                        struct RawReader<T: AsFd>(pub T);
+                        impl<T: AsFd> io::Read for RawReader<T> {
                             fn read(&mut self, b: &mut [u8]) -> io::Result<usize> {
-                                rustix::io::read(self.0, b).map_err(Into::into)
+                                rustix::io::read(&self.0, b).map_err(Into::into)
                             }
                         }
                         let stdin = RawReader(rustix::stdio::stdin());

Original file line number	Diff line number	Diff line change
`@@ -56,10 +56,12 @@ impl MultifileReader<'_> {`
`56`	`56`	`// limit.`
`57`	`57`	`#[cfg(any(unix, target_os = "wasi"))]`
`58`	`58`	`{`
`59`		`- struct RawReader<'a>(rustix::fd::BorrowedFd<'a>);`
`60`		`- impl io::Read for RawReader<'_> {`
	`59`	`+ use std::os::fd::AsFd;`
	`60`	`+ // todo: definition is generic enough to move to uucore::io::RawReader if useful`
	`61`	`+ struct RawReader<T: AsFd>(pub T);`
	`62`	`+ impl<T: AsFd> io::Read for RawReader<T> {`
`61`	`63`	`fn read(&mut self, b: &mut [u8]) -> io::Result<usize> {`
`62`		`- rustix::io::read(self.0, b).map_err(Into::into)`
	`64`	`+ rustix::io::read(&self.0, b).map_err(Into::into)`
`63`	`65`	`}`
`64`	`66`	`}`
`65`	`67`	`let stdin = RawReader(rustix::stdio::stdin());`