diff options
| author | bors <bors@rust-lang.org> | 2024-06-23 08:57:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-06-23 08:57:00 +0000 |
| commit | 05468cf1241ae661c84e43d6a41d7a0ba317eebf (patch) | |
| tree | c3d071be712ceaafd88b23a6d016b1f6dab53f59 /library/std | |
| parent | d4cc01c2f2bdfe1eac2e0c9159ff45706c7cd5df (diff) | |
| parent | 9459fc20d786f729b04fae8533fb94d3c6d30928 (diff) | |
| download | rust-05468cf1241ae661c84e43d6a41d7a0ba317eebf.tar.gz rust-05468cf1241ae661c84e43d6a41d7a0ba317eebf.zip | |
Auto merge of #126855 - matthiaskrgr:rollup-ap5m2l6, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #126720 (Ignore `branch-protection-check-IBT` run-make test) - #126779 (Try to clarify the confusingly-named `RustDev` and `RustcDev` steps) - #126782 (Support absolute source paths in bootstrap) - #126783 (Fix issue number for the `tcplistener_into_incoming` feature) - #126843 (Allow "C-unwind" fn to have C variadics) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std')
| -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 { |