nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 06:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #126783 - tguichaoua:fix_tcplistener_into_incoming_issue_number, r=workingjubilee

Browse Source 
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
This commit is contained in:
Matthias Krüger 2024-06-23 09:45:29 +02:00 committed by GitHub
commit 08d2fc7c51
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/std/src/net/mod.rs
View File

@ -27,7 +27,7 @@ use crate::io::{self, ErrorKind};
pub use self::ip_addr::{IpAddr, Ipv4Addr, Ipv6Addr, Ipv6MulticastScope}; pub use self::ip_addr::{IpAddr, Ipv4Addr, Ipv6Addr, Ipv6MulticastScope};
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
pub use self::socket_addr::{SocketAddr, SocketAddrV4, SocketAddrV6, ToSocketAddrs}; 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; pub use self::tcp::IntoIncoming;
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
pub use self::tcp::{Incoming, TcpListener, TcpStream}; pub use self::tcp::{Incoming, TcpListener, TcpStream};

8
library/std/src/net/tcp.rs
View File

@ -105,7 +105,7 @@ pub struct Incoming<'a> {
/// ///
/// [`accept`]: TcpListener::accept /// [`accept`]: TcpListener::accept
#[derive(Debug)] #[derive(Debug)]
#[unstable(feature = "tcplistener_into_incoming", issue = "88339")] #[unstable(feature = "tcplistener_into_incoming", issue = "88373")]
pub struct IntoIncoming { pub struct IntoIncoming {
listener: TcpListener, listener: TcpListener,
} }
@ -894,7 +894,7 @@ impl TcpListener {
/// } /// }
/// ``` /// ```
#[must_use = "`self` will be dropped if the result is not used"] #[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 { pub fn into_incoming(self) -> IntoIncoming {
IntoIncoming { listener: self } IntoIncoming { listener: self }
} }
@ -1033,7 +1033,7 @@ impl<'a> Iterator for Incoming<'a> {
#[stable(feature = "tcp_listener_incoming_fused_iterator", since = "1.64.0")] #[stable(feature = "tcp_listener_incoming_fused_iterator", since = "1.64.0")]
impl FusedIterator for Incoming<'_> {} impl FusedIterator for Incoming<'_> {}
#[unstable(feature = "tcplistener_into_incoming", issue = "88339")] #[unstable(feature = "tcplistener_into_incoming", issue = "88373")]
impl Iterator for IntoIncoming { impl Iterator for IntoIncoming {
type Item = io::Result<TcpStream>; type Item = io::Result<TcpStream>;
fn next(&mut self) -> Option<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 FusedIterator for IntoIncoming {}
impl AsInner<net_imp::TcpListener> for TcpListener { impl AsInner<net_imp::TcpListener> for TcpListener {