diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-06-23 09:45:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-23 09:45:29 +0200 |
| commit | 08d2fc7c516e45d12eb7c7fa60b090bc2464f629 (patch) | |
| tree | da0376a3dc064b4a4b9f144430417e5a0f839e81 | |
| parent | 92af6703b8faac5a6c3202be1744b0dad1a09e93 (diff) | |
| parent | af9f632be7563b1aac92bc76d05abc50ec020fe5 (diff) | |
| download | rust-08d2fc7c516e45d12eb7c7fa60b090bc2464f629.tar.gz rust-08d2fc7c516e45d12eb7c7fa60b090bc2464f629.zip | |
Rollup merge of #126783 - tguichaoua:fix_tcplistener_into_incoming_issue_number, r=workingjubilee
Fix issue number for the `tcplistener_into_incoming` feature As per [this comment](https://github.com/rust-lang/rust/pull/88339#discussion_r922899044), the issue number for the `tcplistener_into_incoming` feature is the one of the PR that implements it instead of the tracking issue. - https://github.com/rust-lang/rust/pull/88339 - https://github.com/rust-lang/rust/issues/88373
| -rw-r--r-- | library/std/src/net/mod.rs | 2 | ||||
| -rw-r--r-- | library/std/src/net/tcp.rs | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/library/std/src/net/mod.rs b/library/std/src/net/mod.rs index bcab15db35b..858776f1446 100644 --- a/library/std/src/net/mod.rs +++ b/library/std/src/net/mod.rs @@ -27,7 +27,7 @@ use crate::io::{self, ErrorKind}; pub use self::ip_addr::{IpAddr, Ipv4Addr, Ipv6Addr, Ipv6MulticastScope}; #[stable(feature = "rust1", since = "1.0.0")] pub use self::socket_addr::{SocketAddr, SocketAddrV4, SocketAddrV6, ToSocketAddrs}; -#[unstable(feature = "tcplistener_into_incoming", issue = "88339")] +#[unstable(feature = "tcplistener_into_incoming", issue = "88373")] pub use self::tcp::IntoIncoming; #[stable(feature = "rust1", since = "1.0.0")] pub use self::tcp::{Incoming, TcpListener, TcpStream}; diff --git a/library/std/src/net/tcp.rs b/library/std/src/net/tcp.rs index 9667d5f920e..6336354239b 100644 --- a/library/std/src/net/tcp.rs +++ b/library/std/src/net/tcp.rs @@ -105,7 +105,7 @@ pub struct Incoming<'a> { /// /// [`accept`]: TcpListener::accept #[derive(Debug)] -#[unstable(feature = "tcplistener_into_incoming", issue = "88339")] +#[unstable(feature = "tcplistener_into_incoming", issue = "88373")] pub struct IntoIncoming { listener: TcpListener, } @@ -894,7 +894,7 @@ impl TcpListener { /// } /// ``` #[must_use = "`self` will be dropped if the result is not used"] - #[unstable(feature = "tcplistener_into_incoming", issue = "88339")] + #[unstable(feature = "tcplistener_into_incoming", issue = "88373")] pub fn into_incoming(self) -> IntoIncoming { IntoIncoming { listener: self } } @@ -1033,7 +1033,7 @@ impl<'a> Iterator for Incoming<'a> { #[stable(feature = "tcp_listener_incoming_fused_iterator", since = "1.64.0")] impl FusedIterator for Incoming<'_> {} -#[unstable(feature = "tcplistener_into_incoming", issue = "88339")] +#[unstable(feature = "tcplistener_into_incoming", issue = "88373")] impl Iterator for IntoIncoming { type Item = io::Result<TcpStream>; fn next(&mut self) -> Option<io::Result<TcpStream>> { @@ -1041,7 +1041,7 @@ impl Iterator for IntoIncoming { } } -#[unstable(feature = "tcplistener_into_incoming", issue = "88339")] +#[unstable(feature = "tcplistener_into_incoming", issue = "88373")] impl FusedIterator for IntoIncoming {} impl AsInner<net_imp::TcpListener> for TcpListener { |