Move io::IoSlice[Mut] to alloc

Author: a1phyr

library/std/src/sys/io/io_slice/iovec.rs library/alloc/src/io/io_slice/iovec.rslibrary/std/src/sys/io/io_slice/iovec.rs renamed to library/alloc/src/io/io_slice/iovec.rs

@@ -1,13 +1,13 @@
-#[cfg(target_os = "hermit")]
-use hermit_abi::iovec;
-#[cfg(any(target_family = "unix", target_os = "trusty", target_os = "wasi"))]
-use libc::iovec;
+use core::ffi::c_void;
+use core::marker::PhantomData;
+use core::slice;
 
-use crate::ffi::c_void;
-use crate::marker::PhantomData;
-use crate::slice;
-#[cfg(target_os = "solid_asp3")]
-use crate::sys::pal::abi::sockets::iovec;
+#[derive(Copy, Clone)]
+#[repr(C)]
+struct iovec {
+    iov_base: *mut c_void,
+    iov_len: usize,
+}
 
 #[derive(Copy, Clone)]
 #[repr(transparent)]

library/alloc/src/io/io_slice/mod.rs

@@ -0,0 +1,28 @@
+//! Target-dependant definition of `IoSlice` and `IoSliceMut`
+//!
+//! This is necessary to do it in `alloc` because other parts of the crate need
+//! them even though they must have different layouts depending on the platform.
+//!
+//! However, we take great care to not leak platform-specific details and to not
+//! link to any library here.
+
+#![allow(unreachable_pub)]
+
+cfg_select! {
+    any(target_family = "unix", target_os = "hermit", target_os = "solid_asp3", target_os = "trusty", target_os = "wasi") => {
+        mod iovec;
+        pub use iovec::*;
+    }
+    target_os = "windows" => {
+        mod windows;
+        pub use windows::*;
+    }
+    target_os = "uefi" => {
+        mod uefi;
+        pub use uefi::*;
+    }
+    _ => {
+        mod unsupported;
+        pub use unsupported::*;
+    }
+}

library/std/src/sys/io/io_slice/uefi.rs library/alloc/src/io/io_slice/uefi.rslibrary/std/src/sys/io/io_slice/uefi.rs renamed to library/alloc/src/io/io_slice/uefi.rs

@@ -1,8 +1,8 @@
 //! A buffer type used with `Write::write_vectored` for UEFI Networking APIs. Vectored writing to
 //! File is not supported as of UEFI Spec 2.11.
 
-use crate::marker::PhantomData;
-use crate::slice;
+use core::marker::PhantomData;
+use core::slice;
 
 #[derive(Copy, Clone)]
 #[repr(C)]

…y/std/src/sys/io/io_slice/unsupported.rs …ary/alloc/src/io/io_slice/unsupported.rslibrary/std/src/sys/io/io_slice/unsupported.rs renamed to library/alloc/src/io/io_slice/unsupported.rs library/std/src/sys/io/io_slice/unsupported.rs renamed to library/alloc/src/io/io_slice/unsupported.rs

@@ -1,5 +1,3 @@
-use crate::mem;
-
 #[derive(Copy, Clone)]
 pub struct IoSlice<'a>(&'a [u8]);
 
@@ -30,7 +28,7 @@ impl<'a> IoSliceMut<'a> {
 
     #[inline]
     pub fn advance(&mut self, n: usize) {
-        let slice = mem::take(&mut self.0);
+        let slice = core::mem::take(&mut self.0);
         let (_, remaining) = slice.split_at_mut(n);
         self.0 = remaining;
     }

…brary/std/src/sys/io/io_slice/windows.rs library/alloc/src/io/io_slice/windows.rslibrary/std/src/sys/io/io_slice/windows.rs renamed to library/alloc/src/io/io_slice/windows.rs library/std/src/sys/io/io_slice/windows.rs renamed to library/alloc/src/io/io_slice/windows.rs

@@ -1,11 +1,17 @@
-use crate::marker::PhantomData;
-use crate::slice;
-use crate::sys::c;
+use core::marker::PhantomData;
+use core::slice;
+
+#[derive(Copy, Clone)]
+#[repr(C)]
+pub struct WSABUF {
+    pub len: u32,
+    pub buf: *mut u8,
+}
 
 #[derive(Copy, Clone)]
 #[repr(transparent)]
 pub struct IoSlice<'a> {
-    vec: c::WSABUF,
+    vec: WSABUF,
     _p: PhantomData<&'a [u8]>,
 }
 
@@ -14,7 +20,7 @@ impl<'a> IoSlice<'a> {
     pub fn new(buf: &'a [u8]) -> IoSlice<'a> {
         assert!(buf.len() <= u32::MAX as usize);
         IoSlice {
-            vec: c::WSABUF { len: buf.len() as u32, buf: buf.as_ptr() as *mut u8 },
+            vec: WSABUF { len: buf.len() as u32, buf: buf.as_ptr() as *mut u8 },
             _p: PhantomData,
         }
     }
@@ -39,18 +45,15 @@ impl<'a> IoSlice<'a> {
 
 #[repr(transparent)]
 pub struct IoSliceMut<'a> {
-    vec: c::WSABUF,
+    vec: WSABUF,
     _p: PhantomData<&'a mut [u8]>,
 }
 
 impl<'a> IoSliceMut<'a> {
     #[inline]
     pub fn new(buf: &'a mut [u8]) -> IoSliceMut<'a> {
         assert!(buf.len() <= u32::MAX as usize);
-        IoSliceMut {
-            vec: c::WSABUF { len: buf.len() as u32, buf: buf.as_mut_ptr() },
-            _p: PhantomData,
-        }
+        IoSliceMut { vec: WSABUF { len: buf.len() as u32, buf: buf.as_mut_ptr() }, _p: PhantomData }
     }
 
     #[inline]