Merging upstream version 1.70.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 4 insertions, 10 deletions

diff --git a/vendor/rustix/src/net/mod.rs b/vendor/rustix/src/net/mod.rs
index 24fe06dc3..4a3419737 100644
--- a/vendor/rustix/src/net/mod.rs
+++ b/vendor/rustix/src/net/mod.rs
@@ -4,8 +4,8 @@
 //! of these APIs. [`wsa_cleanup`] may be used in the process if these APIs are
 //! no longer needed.
 //!
-//! [`wsa_startup`]: https://docs.rs/rustix/latest/x86_64-pc-windows-msvc/rustix/net/fn.wsa_startup.html
-//! [`wsa_cleanup`]: https://docs.rs/rustix/latest/x86_64-pc-windows-msvc/rustix/net/fn.wsa_cleanup.html
+//! [`wsa_startup`]: https://docs.rs/rustix/*/x86_64-pc-windows-msvc/rustix/net/fn.wsa_startup.html
+//! [`wsa_cleanup`]: https://docs.rs/rustix/*/x86_64-pc-windows-msvc/rustix/net/fn.wsa_cleanup.html
 
 #[cfg(not(feature = "std"))]
 mod addr;
@@ -21,14 +21,8 @@ mod wsa;
 
 pub mod sockopt;
 
-pub use send_recv::{
-    recv, recvfrom, send, sendto, sendto_any, sendto_v4, sendto_v6, RecvFlags, SendFlags,
-};
-pub use socket::{
-    accept, accept_with, acceptfrom, acceptfrom_with, bind, bind_any, bind_v4, bind_v6, connect,
-    connect_any, connect_v4, connect_v6, getpeername, getsockname, listen, shutdown, socket,
-    socket_with, AcceptFlags, AddressFamily, Protocol, Shutdown, SocketFlags, SocketType,
-};
+pub use send_recv::*;
+pub use socket::*;
 pub use socket_addr_any::{SocketAddrAny, SocketAddrStorage};
 #[cfg(not(any(windows, target_os = "wasi")))]
 pub use socketpair::socketpair;