From a990de90fe41456a23e58bd087d2f107d321f3a1 Mon Sep 17 00:00:00 2001 From: Valentin Popov Date: Fri, 19 Jul 2024 16:37:58 +0400 Subject: Deleted vendor folder --- .../rustix/src/maybe_polyfill/no_std/os/fd/mod.rs | 25 -- .../src/maybe_polyfill/no_std/os/fd/owned.rs | 294 --------------------- .../rustix/src/maybe_polyfill/no_std/os/fd/raw.rs | 164 ------------ vendor/rustix/src/maybe_polyfill/no_std/os/mod.rs | 4 - .../src/maybe_polyfill/no_std/os/windows/io/mod.rs | 5 - .../src/maybe_polyfill/no_std/os/windows/io/raw.rs | 71 ----- .../maybe_polyfill/no_std/os/windows/io/socket.rs | 199 -------------- .../src/maybe_polyfill/no_std/os/windows/mod.rs | 19 -- 8 files changed, 781 deletions(-) delete mode 100644 vendor/rustix/src/maybe_polyfill/no_std/os/fd/mod.rs delete mode 100644 vendor/rustix/src/maybe_polyfill/no_std/os/fd/owned.rs delete mode 100644 vendor/rustix/src/maybe_polyfill/no_std/os/fd/raw.rs delete mode 100644 vendor/rustix/src/maybe_polyfill/no_std/os/mod.rs delete mode 100644 vendor/rustix/src/maybe_polyfill/no_std/os/windows/io/mod.rs delete mode 100644 vendor/rustix/src/maybe_polyfill/no_std/os/windows/io/raw.rs delete mode 100644 vendor/rustix/src/maybe_polyfill/no_std/os/windows/io/socket.rs delete mode 100644 vendor/rustix/src/maybe_polyfill/no_std/os/windows/mod.rs (limited to 'vendor/rustix/src/maybe_polyfill/no_std/os') diff --git a/vendor/rustix/src/maybe_polyfill/no_std/os/fd/mod.rs b/vendor/rustix/src/maybe_polyfill/no_std/os/fd/mod.rs deleted file mode 100644 index ea55953..0000000 --- a/vendor/rustix/src/maybe_polyfill/no_std/os/fd/mod.rs +++ /dev/null @@ -1,25 +0,0 @@ -//! The following is derived from Rust's -//! library/std/src/os/fd/mod.rs at revision -//! fa68e73e9947be8ffc5b3b46d899e4953a44e7e9. -//! -//! All code in this file is licensed MIT or Apache 2.0 at your option. -//! -//! Owned and borrowed Unix-like file descriptors. -//! -//! This module is supported on Unix platforms and WASI, which both use a -//! similar file descriptor system for referencing OS resources. - -#![cfg_attr(staged_api, stable(feature = "os_fd", since = "1.66.0"))] -#![deny(unsafe_op_in_unsafe_fn)] - -// `RawFd`, `AsRawFd`, etc. -mod raw; - -// `OwnedFd`, `AsFd`, etc. -mod owned; - -// Export the types and traits for the public API. -#[cfg_attr(staged_api, stable(feature = "os_fd", since = "1.66.0"))] -pub use owned::*; -#[cfg_attr(staged_api, stable(feature = "os_fd", since = "1.66.0"))] -pub use raw::*; diff --git a/vendor/rustix/src/maybe_polyfill/no_std/os/fd/owned.rs b/vendor/rustix/src/maybe_polyfill/no_std/os/fd/owned.rs deleted file mode 100644 index d765c1d..0000000 --- a/vendor/rustix/src/maybe_polyfill/no_std/os/fd/owned.rs +++ /dev/null @@ -1,294 +0,0 @@ -//! The following is derived from Rust's -//! library/std/src/os/fd/owned.rs at revision -//! 334a54cd83191f38ad8046ed94c45de735c86c65. -//! -//! All code in this file is licensed MIT or Apache 2.0 at your option. -//! -//! Owned and borrowed Unix-like file descriptors. - -#![cfg_attr(staged_api, unstable(feature = "io_safety", issue = "87074"))] -#![deny(unsafe_op_in_unsafe_fn)] -#![allow(unsafe_code)] - -use super::raw::{AsRawFd, FromRawFd, IntoRawFd, RawFd}; -use crate::io::close; -use core::fmt; -use core::marker::PhantomData; -use core::mem::forget; - -/// A borrowed file descriptor. -/// -/// This has a lifetime parameter to tie it to the lifetime of something that owns the file -/// descriptor. For the duration of that lifetime, it is guaranteed that nobody will close the file -/// descriptor. -/// -/// This uses `repr(transparent)` and has the representation of a host file -/// descriptor, so it can be used in FFI in places where a file descriptor is -/// passed as an argument, it is not captured or consumed, and it never has the -/// value `-1`. -/// -/// This type's `.to_owned()` implementation returns another `BorrowedFd` -/// rather than an `OwnedFd`. It just makes a trivial copy of the raw file -/// descriptor, which is then borrowed under the same lifetime. -#[derive(Copy, Clone)] -#[repr(transparent)] -#[cfg_attr(rustc_attrs, rustc_layout_scalar_valid_range_start(0))] -// libstd/os/raw/mod.rs assures me that every libstd-supported platform has a -// 32-bit c_int. Below is -2, in two's complement, but that only works out -// because c_int is 32 bits. -#[cfg_attr(rustc_attrs, rustc_layout_scalar_valid_range_end(0xFF_FF_FF_FE))] -#[cfg_attr(rustc_attrs, rustc_nonnull_optimization_guaranteed)] -#[cfg_attr(staged_api, stable(feature = "io_safety", since = "1.63.0"))] -pub struct BorrowedFd<'fd> { - fd: RawFd, - _phantom: PhantomData<&'fd OwnedFd>, -} - -/// An owned file descriptor. -/// -/// This closes the file descriptor on drop. It is guaranteed that nobody else will close the file -/// descriptor. -/// -/// This uses `repr(transparent)` and has the representation of a host file -/// descriptor, so it can be used in FFI in places where a file descriptor is -/// passed as a consumed argument or returned as an owned value, and it never -/// has the value `-1`. -#[repr(transparent)] -#[cfg_attr(rustc_attrs, rustc_layout_scalar_valid_range_start(0))] -// libstd/os/raw/mod.rs assures me that every libstd-supported platform has a -// 32-bit c_int. Below is -2, in two's complement, but that only works out -// because c_int is 32 bits. -#[cfg_attr(rustc_attrs, rustc_layout_scalar_valid_range_end(0xFF_FF_FF_FE))] -#[cfg_attr(staged_api, unstable(feature = "io_safety", issue = "87074"))] -#[cfg_attr(rustc_attrs, rustc_nonnull_optimization_guaranteed)] -pub struct OwnedFd { - fd: RawFd, -} - -impl BorrowedFd<'_> { - /// Return a `BorrowedFd` holding the given raw file descriptor. - /// - /// # Safety - /// - /// The resource pointed to by `fd` must remain open for the duration of - /// the returned `BorrowedFd`, and it must not have the value `-1`. - #[inline] - #[cfg_attr( - staged_api, - rustc_const_stable(feature = "io_safety", since = "1.63.0") - )] - #[cfg_attr(staged_api, stable(feature = "io_safety", since = "1.63.0"))] - pub const unsafe fn borrow_raw(fd: RawFd) -> Self { - assert!(fd != u32::MAX as RawFd); - // SAFETY: we just asserted that the value is in the valid range and isn't `-1` (the only value bigger than `0xFF_FF_FF_FE` unsigned) - #[allow(unused_unsafe)] - unsafe { - Self { - fd, - _phantom: PhantomData, - } - } - } -} - -impl OwnedFd { - /// Creates a new `OwnedFd` instance that shares the same underlying file handle - /// as the existing `OwnedFd` instance. - #[cfg(not(target_arch = "wasm32"))] - pub fn try_clone(&self) -> crate::io::Result { - // We want to atomically duplicate this file descriptor and set the - // CLOEXEC flag, and currently that's done via F_DUPFD_CLOEXEC. This - // is a POSIX flag that was added to Linux in 2.6.24. - #[cfg(not(target_os = "espidf"))] - let fd = crate::io::fcntl_dupfd_cloexec(self, 0)?; - - // For ESP-IDF, F_DUPFD is used instead, because the CLOEXEC semantics - // will never be supported, as this is a bare metal framework with - // no capabilities for multi-process execution. While F_DUPFD is also - // not supported yet, it might be (currently it returns ENOSYS). - #[cfg(target_os = "espidf")] - let fd = crate::io::fcntl_dupfd(self)?; - - Ok(fd.into()) - } - - /// Creates a new `OwnedFd` instance that shares the same underlying file handle - /// as the existing `OwnedFd` instance. - #[cfg(target_arch = "wasm32")] - pub fn try_clone(&self) -> crate::io::Result { - Err(crate::io::Errno::NOSYS) - } -} - -impl BorrowedFd<'_> { - /// Creates a new `OwnedFd` instance that shares the same underlying file - /// description as the existing `BorrowedFd` instance. - #[cfg(not(any(target_arch = "wasm32", target_os = "hermit")))] - #[cfg_attr(staged_api, stable(feature = "io_safety", since = "1.63.0"))] - pub fn try_clone_to_owned(&self) -> crate::io::Result { - // Avoid using file descriptors below 3 as they are used for stdio - - // We want to atomically duplicate this file descriptor and set the - // CLOEXEC flag, and currently that's done via F_DUPFD_CLOEXEC. This - // is a POSIX flag that was added to Linux in 2.6.24. - #[cfg(not(target_os = "espidf"))] - let fd = crate::io::fcntl_dupfd_cloexec(self, 3)?; - - // For ESP-IDF, F_DUPFD is used instead, because the CLOEXEC semantics - // will never be supported, as this is a bare metal framework with - // no capabilities for multi-process execution. While F_DUPFD is also - // not supported yet, it might be (currently it returns ENOSYS). - #[cfg(target_os = "espidf")] - let fd = crate::io::fcntl_dupfd(self, 3)?; - - Ok(fd) - } - - /// Creates a new `OwnedFd` instance that shares the same underlying file - /// description as the existing `BorrowedFd` instance. - #[cfg(any(target_arch = "wasm32", target_os = "hermit"))] - #[cfg_attr(staged_api, stable(feature = "io_safety", since = "1.63.0"))] - pub fn try_clone_to_owned(&self) -> crate::io::Result { - Err(crate::io::Errno::NOSYS) - } -} - -#[cfg_attr(staged_api, unstable(feature = "io_safety", issue = "87074"))] -impl AsRawFd for BorrowedFd<'_> { - #[inline] - fn as_raw_fd(&self) -> RawFd { - self.fd - } -} - -#[cfg_attr(staged_api, unstable(feature = "io_safety", issue = "87074"))] -impl AsRawFd for OwnedFd { - #[inline] - fn as_raw_fd(&self) -> RawFd { - self.fd - } -} - -#[cfg_attr(staged_api, unstable(feature = "io_safety", issue = "87074"))] -impl IntoRawFd for OwnedFd { - #[inline] - fn into_raw_fd(self) -> RawFd { - let fd = self.fd; - forget(self); - fd - } -} - -#[cfg_attr(staged_api, unstable(feature = "io_safety", issue = "87074"))] -impl FromRawFd for OwnedFd { - /// Constructs a new instance of `Self` from the given raw file descriptor. - /// - /// # Safety - /// - /// The resource pointed to by `fd` must be open and suitable for assuming - /// [ownership][io-safety]. The resource must not require any cleanup other than `close`. - /// - /// [io-safety]: io#io-safety - #[inline] - unsafe fn from_raw_fd(fd: RawFd) -> Self { - assert_ne!(fd, u32::MAX as RawFd); - // SAFETY: we just asserted that the value is in the valid range and isn't `-1` (the only value bigger than `0xFF_FF_FF_FE` unsigned) - #[allow(unused_unsafe)] - unsafe { - Self { fd } - } - } -} - -#[cfg_attr(staged_api, unstable(feature = "io_safety", issue = "87074"))] -impl Drop for OwnedFd { - #[inline] - fn drop(&mut self) { - unsafe { - // Errors are ignored when closing a file descriptor. The reason - // for this is that if an error occurs we don't actually know if - // the file descriptor was closed or not, and if we retried (for - // something like EINTR), we might close another valid file - // descriptor opened after we closed ours. - close(self.fd as _); - } - } -} - -#[cfg_attr(staged_api, unstable(feature = "io_safety", issue = "87074"))] -impl fmt::Debug for BorrowedFd<'_> { - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - f.debug_struct("BorrowedFd").field("fd", &self.fd).finish() - } -} - -#[cfg_attr(staged_api, unstable(feature = "io_safety", issue = "87074"))] -impl fmt::Debug for OwnedFd { - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - f.debug_struct("OwnedFd").field("fd", &self.fd).finish() - } -} - -/// A trait to borrow the file descriptor from an underlying object. -/// -/// This is only available on unix platforms and must be imported in order to -/// call the method. Windows platforms have a corresponding `AsHandle` and -/// `AsSocket` set of traits. -#[cfg_attr(staged_api, unstable(feature = "io_safety", issue = "87074"))] -pub trait AsFd { - /// Borrows the file descriptor. - /// - /// # Example - /// - /// ```no_run - /// # #![feature(io_safety)] - /// use std::fs::File; - /// # use std::io; - /// # #[cfg(target_os = "wasi")] - /// # use std::os::wasi::io::{AsFd, BorrowedFd}; - /// # #[cfg(unix)] - /// # use std::os::unix::io::{AsFd, BorrowedFd}; - /// - /// let mut f = File::open("foo.txt")?; - /// # #[cfg(any(unix, target_os = "wasi"))] - /// let borrowed_fd: BorrowedFd<'_> = f.as_fd(); - /// # Ok::<(), io::Error>(()) - /// ``` - #[cfg_attr(staged_api, unstable(feature = "io_safety", issue = "87074"))] - fn as_fd(&self) -> BorrowedFd<'_>; -} - -#[cfg_attr(staged_api, unstable(feature = "io_safety", issue = "87074"))] -impl AsFd for &T { - #[inline] - fn as_fd(&self) -> BorrowedFd<'_> { - T::as_fd(self) - } -} - -#[cfg_attr(staged_api, unstable(feature = "io_safety", issue = "87074"))] -impl AsFd for &mut T { - #[inline] - fn as_fd(&self) -> BorrowedFd<'_> { - T::as_fd(self) - } -} - -#[cfg_attr(staged_api, unstable(feature = "io_safety", issue = "87074"))] -impl AsFd for BorrowedFd<'_> { - #[inline] - fn as_fd(&self) -> BorrowedFd<'_> { - *self - } -} - -#[cfg_attr(staged_api, unstable(feature = "io_safety", issue = "87074"))] -impl AsFd for OwnedFd { - #[inline] - fn as_fd(&self) -> BorrowedFd<'_> { - // SAFETY: `OwnedFd` and `BorrowedFd` have the same validity - // invariants, and the `BorrowedFd` is bounded by the lifetime - // of `&self`. - unsafe { BorrowedFd::borrow_raw(self.as_raw_fd()) } - } -} diff --git a/vendor/rustix/src/maybe_polyfill/no_std/os/fd/raw.rs b/vendor/rustix/src/maybe_polyfill/no_std/os/fd/raw.rs deleted file mode 100644 index 8f6b75a..0000000 --- a/vendor/rustix/src/maybe_polyfill/no_std/os/fd/raw.rs +++ /dev/null @@ -1,164 +0,0 @@ -//! The following is derived from Rust's -//! library/std/src/os/fd/raw.rs at revision -//! 334a54cd83191f38ad8046ed94c45de735c86c65. -//! -//! All code in this file is licensed MIT or Apache 2.0 at your option. -//! -//! Raw Unix-like file descriptors. - -#![cfg_attr(staged_api, stable(feature = "rust1", since = "1.0.0"))] -#![allow(unsafe_code)] - -use crate::backend::c; - -/// Raw file descriptors. -#[cfg_attr(staged_api, stable(feature = "rust1", since = "1.0.0"))] -pub type RawFd = c::c_int; - -/// A trait to extract the raw file descriptor from an underlying object. -/// -/// This is only available on unix and WASI platforms and must be imported in -/// order to call the method. Windows platforms have a corresponding -/// `AsRawHandle` and `AsRawSocket` set of traits. -#[cfg_attr(staged_api, stable(feature = "rust1", since = "1.0.0"))] -pub trait AsRawFd { - /// Extracts the raw file descriptor. - /// - /// This function is typically used to **borrow** an owned file descriptor. - /// When used in this way, this method does **not** pass ownership of the - /// raw file descriptor to the caller, and the file descriptor is only - /// guaranteed to be valid while the original object has not yet been - /// destroyed. - /// - /// However, borrowing is not strictly required. See [`AsFd::as_fd`] - /// for an API which strictly borrows a file descriptor. - /// - /// # Example - /// - /// ```no_run - /// use std::fs::File; - /// # use std::io; - /// #[cfg(unix)] - /// use std::os::unix::io::{AsRawFd, RawFd}; - /// #[cfg(target_os = "wasi")] - /// use std::os::wasi::io::{AsRawFd, RawFd}; - /// - /// let mut f = File::open("foo.txt")?; - /// // `raw_fd` is only valid as long as `f` exists. - /// #[cfg(any(unix, target_os = "wasi"))] - /// let raw_fd: RawFd = f.as_raw_fd(); - /// # Ok::<(), io::Error>(()) - /// ``` - #[cfg_attr(staged_api, stable(feature = "rust1", since = "1.0.0"))] - fn as_raw_fd(&self) -> RawFd; -} - -/// A trait to express the ability to construct an object from a raw file -/// descriptor. -#[cfg_attr(staged_api, stable(feature = "from_raw_os", since = "1.1.0"))] -pub trait FromRawFd { - /// Constructs a new instance of `Self` from the given raw file - /// descriptor. - /// - /// This function is typically used to **consume ownership** of the - /// specified file descriptor. When used in this way, the returned object - /// will take responsibility for closing it when the object goes out of - /// scope. - /// - /// However, consuming ownership is not strictly required. Use a - /// [`From::from`] implementation for an API which strictly - /// consumes ownership. - /// - /// # Safety - /// - /// The `fd` passed in must be an [owned file descriptor][io-safety]; - /// in particular, it must be open. - /// - /// [io-safety]: io#io-safety - /// - /// # Example - /// - /// ```no_run - /// use std::fs::File; - /// # use std::io; - /// #[cfg(unix)] - /// use std::os::unix::io::{FromRawFd, IntoRawFd, RawFd}; - /// #[cfg(target_os = "wasi")] - /// use std::os::wasi::io::{FromRawFd, IntoRawFd, RawFd}; - /// - /// let f = File::open("foo.txt")?; - /// # #[cfg(any(unix, target_os = "wasi"))] - /// let raw_fd: RawFd = f.into_raw_fd(); - /// // SAFETY: no other functions should call `from_raw_fd`, so there - /// // is only one owner for the file descriptor. - /// # #[cfg(any(unix, target_os = "wasi"))] - /// let f = unsafe { File::from_raw_fd(raw_fd) }; - /// # Ok::<(), io::Error>(()) - /// ``` - #[cfg_attr(staged_api, stable(feature = "from_raw_os", since = "1.1.0"))] - unsafe fn from_raw_fd(fd: RawFd) -> Self; -} - -/// A trait to express the ability to consume an object and acquire ownership of -/// its raw file descriptor. -#[cfg_attr(staged_api, stable(feature = "into_raw_os", since = "1.4.0"))] -pub trait IntoRawFd { - /// Consumes this object, returning the raw underlying file descriptor. - /// - /// This function is typically used to **transfer ownership** of the underlying - /// file descriptor to the caller. When used in this way, callers are then the unique - /// owners of the file descriptor and must close it once it's no longer needed. - /// - /// However, transferring ownership is not strictly required. Use a - /// [`Into::into`] implementation for an API which strictly - /// transfers ownership. - /// - /// # Example - /// - /// ```no_run - /// use std::fs::File; - /// # use std::io; - /// #[cfg(unix)] - /// use std::os::unix::io::{IntoRawFd, RawFd}; - /// #[cfg(target_os = "wasi")] - /// use std::os::wasi::io::{IntoRawFd, RawFd}; - /// - /// let f = File::open("foo.txt")?; - /// #[cfg(any(unix, target_os = "wasi"))] - /// let raw_fd: RawFd = f.into_raw_fd(); - /// # Ok::<(), io::Error>(()) - /// ``` - #[cfg_attr(staged_api, stable(feature = "into_raw_os", since = "1.4.0"))] - fn into_raw_fd(self) -> RawFd; -} - -#[cfg_attr( - staged_api, - stable(feature = "raw_fd_reflexive_traits", since = "1.48.0") -)] -impl AsRawFd for RawFd { - #[inline] - fn as_raw_fd(&self) -> RawFd { - *self - } -} -#[cfg_attr( - staged_api, - stable(feature = "raw_fd_reflexive_traits", since = "1.48.0") -)] -impl IntoRawFd for RawFd { - #[inline] - fn into_raw_fd(self) -> RawFd { - self - } -} -#[cfg_attr( - staged_api, - stable(feature = "raw_fd_reflexive_traits", since = "1.48.0") -)] -impl FromRawFd for RawFd { - #[inline] - unsafe fn from_raw_fd(fd: RawFd) -> RawFd { - fd - } -} diff --git a/vendor/rustix/src/maybe_polyfill/no_std/os/mod.rs b/vendor/rustix/src/maybe_polyfill/no_std/os/mod.rs deleted file mode 100644 index 67f41f5..0000000 --- a/vendor/rustix/src/maybe_polyfill/no_std/os/mod.rs +++ /dev/null @@ -1,4 +0,0 @@ -#[cfg(any(unix, target_os = "wasi"))] -pub mod fd; -#[cfg(windows)] -pub mod windows; diff --git a/vendor/rustix/src/maybe_polyfill/no_std/os/windows/io/mod.rs b/vendor/rustix/src/maybe_polyfill/no_std/os/windows/io/mod.rs deleted file mode 100644 index 77abd03..0000000 --- a/vendor/rustix/src/maybe_polyfill/no_std/os/windows/io/mod.rs +++ /dev/null @@ -1,5 +0,0 @@ -mod raw; -mod socket; - -pub use raw::{AsRawSocket, FromRawSocket, IntoRawSocket, RawSocket}; -pub use socket::{AsSocket, BorrowedSocket, OwnedSocket}; diff --git a/vendor/rustix/src/maybe_polyfill/no_std/os/windows/io/raw.rs b/vendor/rustix/src/maybe_polyfill/no_std/os/windows/io/raw.rs deleted file mode 100644 index 1e73e00..0000000 --- a/vendor/rustix/src/maybe_polyfill/no_std/os/windows/io/raw.rs +++ /dev/null @@ -1,71 +0,0 @@ -//! The following is derived from Rust's -//! library/std/src/os/windows/io/raw.rs -//! at revision -//! 4f9b394c8a24803e57ba892fa00e539742ebafc0. -//! -//! All code in this file is licensed MIT or Apache 2.0 at your option. - -use super::super::raw; - -/// Raw SOCKETs. -#[cfg_attr(staged_api, stable(feature = "rust1", since = "1.0.0"))] -pub type RawSocket = raw::SOCKET; - -/// Extracts raw sockets. -#[cfg_attr(staged_api, stable(feature = "rust1", since = "1.0.0"))] -pub trait AsRawSocket { - /// Extracts the raw socket. - /// - /// This function is typically used to **borrow** an owned socket. - /// When used in this way, this method does **not** pass ownership of the - /// raw socket to the caller, and the socket is only guaranteed - /// to be valid while the original object has not yet been destroyed. - /// - /// However, borrowing is not strictly required. See [`AsSocket::as_socket`] - /// for an API which strictly borrows a socket. - #[cfg_attr(staged_api, stable(feature = "rust1", since = "1.0.0"))] - fn as_raw_socket(&self) -> RawSocket; -} - -/// Creates I/O objects from raw sockets. -#[cfg_attr(staged_api, stable(feature = "from_raw_os", since = "1.1.0"))] -pub trait FromRawSocket { - /// Constructs a new I/O object from the specified raw socket. - /// - /// This function is typically used to **consume ownership** of the socket - /// given, passing responsibility for closing the socket to the returned - /// object. When used in this way, the returned object - /// will take responsibility for closing it when the object goes out of - /// scope. - /// - /// However, consuming ownership is not strictly required. Use a - /// `From::from` implementation for an API which strictly - /// consumes ownership. - /// - /// # Safety - /// - /// The `socket` passed in must: - /// - be a valid an open socket, - /// - be a socket that may be freed via [`closesocket`]. - /// - /// [`closesocket`]: https://docs.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-closesocket - #[cfg_attr(staged_api, stable(feature = "from_raw_os", since = "1.1.0"))] - unsafe fn from_raw_socket(sock: RawSocket) -> Self; -} - -/// A trait to express the ability to consume an object and acquire ownership of -/// its raw `SOCKET`. -#[cfg_attr(staged_api, stable(feature = "into_raw_os", since = "1.4.0"))] -pub trait IntoRawSocket { - /// Consumes this object, returning the raw underlying socket. - /// - /// This function is typically used to **transfer ownership** of the underlying - /// socket to the caller. When used in this way, callers are then the unique - /// owners of the socket and must close it once it's no longer needed. - /// - /// However, transferring ownership is not strictly required. Use a - /// `Into::into` implementation for an API which strictly - /// transfers ownership. - #[cfg_attr(staged_api, stable(feature = "into_raw_os", since = "1.4.0"))] - fn into_raw_socket(self) -> RawSocket; -} diff --git a/vendor/rustix/src/maybe_polyfill/no_std/os/windows/io/socket.rs b/vendor/rustix/src/maybe_polyfill/no_std/os/windows/io/socket.rs deleted file mode 100644 index bc637aa..0000000 --- a/vendor/rustix/src/maybe_polyfill/no_std/os/windows/io/socket.rs +++ /dev/null @@ -1,199 +0,0 @@ -//! The following is derived from Rust's -//! library/std/src/os/windows/io/socket.rs -//! at revision -//! 4f9b394c8a24803e57ba892fa00e539742ebafc0. -//! -//! All code in this file is licensed MIT or Apache 2.0 at your option. - -use super::raw::*; -use crate::backend::c; -use crate::backend::fd::LibcFd as LibcSocket; -use core::fmt; -use core::marker::PhantomData; -use core::mem::forget; - -/// A borrowed socket. -/// -/// This has a lifetime parameter to tie it to the lifetime of something that -/// owns the socket. -/// -/// This uses `repr(transparent)` and has the representation of a host socket, -/// so it can be used in FFI in places where a socket is passed as an argument, -/// it is not captured or consumed, and it never has the value -/// `INVALID_SOCKET`. -/// -/// This type's `.to_owned()` implementation returns another `BorrowedSocket` -/// rather than an `OwnedSocket`. It just makes a trivial copy of the raw -/// socket, which is then borrowed under the same lifetime. -#[derive(Copy, Clone)] -#[repr(transparent)] -#[cfg_attr(staged_api, rustc_layout_scalar_valid_range_start(0))] -// This is -2, in two's complement. -1 is `INVALID_SOCKET`. -#[cfg_attr( - all(staged_api, target_pointer_width = "32"), - rustc_layout_scalar_valid_range_end(0xFF_FF_FF_FE) -)] -#[cfg_attr( - all(staged_api, target_pointer_width = "64"), - rustc_layout_scalar_valid_range_end(0xFF_FF_FF_FF_FF_FF_FF_FE) -)] -#[cfg_attr(staged_api, rustc_nonnull_optimization_guaranteed)] -#[cfg_attr(staged_api, stable(feature = "io_safety", since = "1.63.0"))] -pub struct BorrowedSocket<'socket> { - socket: RawSocket, - _phantom: PhantomData<&'socket OwnedSocket>, -} - -/// An owned socket. -/// -/// This closes the socket on drop. -/// -/// This uses `repr(transparent)` and has the representation of a host socket, -/// so it can be used in FFI in places where a socket is passed as a consumed -/// argument or returned as an owned value, and it never has the value -/// `INVALID_SOCKET`. -#[repr(transparent)] -#[cfg_attr(staged_api, rustc_layout_scalar_valid_range_start(0))] -// This is -2, in two's complement. -1 is `INVALID_SOCKET`. -#[cfg_attr( - all(staged_api, target_pointer_width = "32"), - rustc_layout_scalar_valid_range_end(0xFF_FF_FF_FE) -)] -#[cfg_attr( - all(staged_api, target_pointer_width = "64"), - rustc_layout_scalar_valid_range_end(0xFF_FF_FF_FF_FF_FF_FF_FE) -)] -#[cfg_attr(staged_api, rustc_nonnull_optimization_guaranteed)] -#[cfg_attr(staged_api, stable(feature = "io_safety", since = "1.63.0"))] -pub struct OwnedSocket { - socket: RawSocket, -} - -impl BorrowedSocket<'_> { - /// Return a `BorrowedSocket` holding the given raw socket. - /// - /// # Safety - /// - /// The resource pointed to by `raw` must remain open for the duration of - /// the returned `BorrowedSocket`, and it must not have the value - /// `INVALID_SOCKET`. - #[inline] - #[cfg_attr( - staged_api, - rustc_const_stable(feature = "io_safety", since = "1.63.0") - )] - #[cfg_attr(staged_api, stable(feature = "io_safety", since = "1.63.0"))] - pub const unsafe fn borrow_raw(socket: RawSocket) -> Self { - assert!(socket != c::INVALID_SOCKET as RawSocket); - Self { - socket, - _phantom: PhantomData, - } - } -} - -#[cfg_attr(staged_api, stable(feature = "io_safety", since = "1.63.0"))] -impl AsRawSocket for BorrowedSocket<'_> { - #[inline] - fn as_raw_socket(&self) -> RawSocket { - self.socket - } -} - -#[cfg_attr(staged_api, stable(feature = "io_safety", since = "1.63.0"))] -impl AsRawSocket for OwnedSocket { - #[inline] - fn as_raw_socket(&self) -> RawSocket { - self.socket - } -} - -#[cfg_attr(staged_api, stable(feature = "io_safety", since = "1.63.0"))] -impl IntoRawSocket for OwnedSocket { - #[inline] - fn into_raw_socket(self) -> RawSocket { - let socket = self.socket; - forget(self); - socket - } -} - -#[cfg_attr(staged_api, stable(feature = "io_safety", since = "1.63.0"))] -impl FromRawSocket for OwnedSocket { - #[inline] - unsafe fn from_raw_socket(socket: RawSocket) -> Self { - debug_assert_ne!(socket, c::INVALID_SOCKET as RawSocket); - Self { socket } - } -} - -#[cfg_attr(staged_api, stable(feature = "io_safety", since = "1.63.0"))] -impl Drop for OwnedSocket { - #[inline] - fn drop(&mut self) { - unsafe { - let _ = c::closesocket(self.socket as LibcSocket); - } - } -} - -#[cfg_attr(staged_api, stable(feature = "io_safety", since = "1.63.0"))] -impl fmt::Debug for BorrowedSocket<'_> { - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - f.debug_struct("BorrowedSocket") - .field("socket", &self.socket) - .finish() - } -} - -#[cfg_attr(staged_api, stable(feature = "io_safety", since = "1.63.0"))] -impl fmt::Debug for OwnedSocket { - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - f.debug_struct("OwnedSocket") - .field("socket", &self.socket) - .finish() - } -} - -/// A trait to borrow the socket from an underlying object. -#[cfg_attr(staged_api, stable(feature = "io_safety", since = "1.63.0"))] -pub trait AsSocket { - /// Borrows the socket. - #[cfg_attr(staged_api, stable(feature = "io_safety", since = "1.63.0"))] - fn as_socket(&self) -> BorrowedSocket<'_>; -} - -#[cfg_attr(staged_api, stable(feature = "io_safety", since = "1.63.0"))] -impl AsSocket for &T { - #[inline] - fn as_socket(&self) -> BorrowedSocket<'_> { - T::as_socket(self) - } -} - -#[cfg_attr(staged_api, stable(feature = "io_safety", since = "1.63.0"))] -impl AsSocket for &mut T { - #[inline] - fn as_socket(&self) -> BorrowedSocket<'_> { - T::as_socket(self) - } -} - -#[cfg_attr(staged_api, stable(feature = "io_safety", since = "1.63.0"))] -impl AsSocket for BorrowedSocket<'_> { - #[inline] - fn as_socket(&self) -> BorrowedSocket<'_> { - *self - } -} - -#[cfg_attr(staged_api, stable(feature = "io_safety", since = "1.63.0"))] -impl AsSocket for OwnedSocket { - #[inline] - fn as_socket(&self) -> BorrowedSocket<'_> { - // Safety: `OwnedSocket` and `BorrowedSocket` have the same validity - // invariants, and the `BorrowdSocket` is bounded by the lifetime - // of `&self`. - unsafe { BorrowedSocket::borrow_raw(self.as_raw_socket()) } - } -} diff --git a/vendor/rustix/src/maybe_polyfill/no_std/os/windows/mod.rs b/vendor/rustix/src/maybe_polyfill/no_std/os/windows/mod.rs deleted file mode 100644 index 02f3894..0000000 --- a/vendor/rustix/src/maybe_polyfill/no_std/os/windows/mod.rs +++ /dev/null @@ -1,19 +0,0 @@ -//! The following is derived from Rust's -//! library/std/src/os/windows/raw.rs, -//! library/std/src/os/windows/io/raw.rs and -//! library/std/src/os/windows/io/socket.rs -//! at revision -//! 4f9b394c8a24803e57ba892fa00e539742ebafc0. -//! -//! All code in this file is licensed MIT or Apache 2.0 at your option. - -mod raw { - #[cfg(target_pointer_width = "32")] - #[cfg_attr(staged_api, stable(feature = "raw_ext", since = "1.1.0"))] - pub type SOCKET = u32; - #[cfg(target_pointer_width = "64")] - #[cfg_attr(staged_api, stable(feature = "raw_ext", since = "1.1.0"))] - pub type SOCKET = u64; -} - -pub mod io; -- cgit v1.2.3