Backport bug fixes to 0.34.x.

src/imp/linux_raw/io/io_slice.rs

@@ -7,6 +7,7 @@
 use super::c;
 use core::marker::PhantomData;
 use core::slice;
+use linux_raw_sys::general::__kernel_size_t;
 
 /// <https://doc.rust-lang.org/nightly/std/io/struct.IoSlice.html>
 #[derive(Copy, Clone)]
@@ -23,7 +24,7 @@ impl<'a> IoSlice<'a> {
         IoSlice {
             vec: c::iovec {
                 iov_base: buf.as_ptr() as *mut u8 as *mut c::c_void,
-                iov_len: buf.len() as u64,
+                iov_len: buf.len() as _,
             },
             _p: PhantomData,
         }
@@ -32,12 +33,12 @@ impl<'a> IoSlice<'a> {
     /// <https://doc.rust-lang.org/nightly/std/io/struct.IoSlice.html#method.advance>
     #[inline]
     pub fn advance(&mut self, n: usize) {
-        if self.vec.iov_len < n as u64 {
+        if self.vec.iov_len < n as _ {
             panic!("advancing IoSlice beyond its length");
         }
 
         unsafe {
-            self.vec.iov_len -= n as u64;
+            self.vec.iov_len -= n as __kernel_size_t;
             self.vec.iov_base = self.vec.iov_base.add(n);
         }
     }
@@ -63,7 +64,7 @@ impl<'a> IoSliceMut<'a> {
         IoSliceMut {
             vec: c::iovec {
                 iov_base: buf.as_mut_ptr() as *mut c::c_void,
-                iov_len: buf.len() as u64,
+                iov_len: buf.len() as _,
             },
             _p: PhantomData,
         }
@@ -72,12 +73,12 @@ impl<'a> IoSliceMut<'a> {
     /// <https://doc.rust-lang.org/nightly/std/io/struct.IoSliceMut.html#method.advance>
     #[inline]
     pub fn advance(&mut self, n: usize) {
-        if self.vec.iov_len < n as u64 {
+        if self.vec.iov_len < n as _ {
             panic!("advancing IoSliceMut beyond its length");
         }
 
         unsafe {
-            self.vec.iov_len -= n as u64;
+            self.vec.iov_len -= n as __kernel_size_t;
             self.vec.iov_base = self.vec.iov_base.add(n);
         }
     }

src/imp/linux_raw/io/syscalls.rs

@@ -557,7 +557,7 @@ pub(crate) fn dup2(fd: BorrowedFd<'_>, new: &OwnedFd) -> io::Result<()> {
     {
         // `dup3` fails if the old and new file descriptors have the same
         // value, so emulate the `dup2` behvior.
-        use std::os::unix::io::AsRawFd;
+        use crate::fd::AsRawFd;
         if fd.as_raw_fd() == new.as_raw_fd() {
             return Ok(());
         }

src/imp/linux_raw/syscalls.rs

@@ -34,7 +34,10 @@ use linux_raw_sys::general::{
     __kernel_pid_t, PR_SET_NAME, SIGCHLD,
 };
 #[cfg(target_arch = "x86")]
-use {super::conv::by_mut, linux_raw_sys::general::__NR_set_thread_area};
+use {
+    super::arch::choose::syscall1, super::conv::by_mut,
+    linux_raw_sys::general::__NR_set_thread_area,
+};
 #[cfg(target_arch = "x86_64")]
 use {
     super::conv::ret_infallible,
@@ -92,7 +95,7 @@ pub(crate) mod tls {
     #[cfg(target_arch = "x86")]
     #[inline]
     pub(crate) unsafe fn set_thread_area(u_info: &mut UserDesc) -> io::Result<()> {
-        ret(syscall1_readonly(nr(__NR_set_thread_area), by_mut(u_info)))
+        ret(syscall1(nr(__NR_set_thread_area), by_mut(u_info)))
     }
 
     #[cfg(target_arch = "arm")]