From 1e53a905ba0e3f70e3a87dcdf557269324765e03 Mon Sep 17 00:00:00 2001 From: Ibraheem Ahmed Date: Sat, 8 Jan 2022 23:48:50 -0500 Subject: [PATCH 1/2] export `tcp::IntoIncoming` --- library/std/src/net/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/std/src/net/mod.rs b/library/std/src/net/mod.rs index a0c77b648fe05..b1faeb831d4e2 100644 --- a/library/std/src/net/mod.rs +++ b/library/std/src/net/mod.rs @@ -26,7 +26,7 @@ pub use self::ip::{IpAddr, Ipv4Addr, Ipv6Addr, Ipv6MulticastScope}; #[stable(feature = "rust1", since = "1.0.0")] pub use self::parser::AddrParseError; #[stable(feature = "rust1", since = "1.0.0")] -pub use self::tcp::{Incoming, TcpListener, TcpStream}; +pub use self::tcp::{Incoming, IntoIncoming, TcpListener, TcpStream}; #[stable(feature = "rust1", since = "1.0.0")] pub use self::udp::UdpSocket; From f88b501914885c9db6bb56d47e96f8d475bd6bdd Mon Sep 17 00:00:00 2001 From: Ibraheem Ahmed Date: Thu, 13 Jan 2022 16:04:02 -0500 Subject: [PATCH 2/2] fix stability attribute for `tcp::IntoIncoming` --- library/std/src/net/mod.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/library/std/src/net/mod.rs b/library/std/src/net/mod.rs index b1faeb831d4e2..2669f4dbf3068 100644 --- a/library/std/src/net/mod.rs +++ b/library/std/src/net/mod.rs @@ -25,8 +25,10 @@ pub use self::addr::{SocketAddr, SocketAddrV4, SocketAddrV6, ToSocketAddrs}; pub use self::ip::{IpAddr, Ipv4Addr, Ipv6Addr, Ipv6MulticastScope}; #[stable(feature = "rust1", since = "1.0.0")] pub use self::parser::AddrParseError; +#[unstable(feature = "tcplistener_into_incoming", issue = "88339")] +pub use self::tcp::IntoIncoming; #[stable(feature = "rust1", since = "1.0.0")] -pub use self::tcp::{Incoming, IntoIncoming, TcpListener, TcpStream}; +pub use self::tcp::{Incoming, TcpListener, TcpStream}; #[stable(feature = "rust1", since = "1.0.0")] pub use self::udp::UdpSocket;