Skip to content

Commit

Permalink
Unrolled build for rust-lang#126783
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#126783 - tguichaoua:fix_tcplistener_into_incoming_issue_number, r=workingjubilee

Fix issue number for the `tcplistener_into_incoming` feature

As per [this comment](rust-lang#88339 (comment)), the issue number for the `tcplistener_into_incoming` feature is the one of the PR that implements it instead of the tracking issue.

- rust-lang#88339
- rust-lang#88373
  • Loading branch information
rust-timer authored Jun 23, 2024
2 parents d4cc01c + af9f632 commit e83e411
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion library/std/src/net/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down
8 changes: 4 additions & 4 deletions library/std/src/net/tcp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
Expand Down Expand Up @@ -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 }
}
Expand Down Expand Up @@ -1033,15 +1033,15 @@ 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>> {
Some(self.listener.accept().map(|p| p.0))
}
}

#[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 {
Expand Down

0 comments on commit e83e411

Please sign in to comment.