diff options
| author | bors <bors@rust-lang.org> | 2021-05-03 14:35:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-05-03 14:35:12 +0000 |
| commit | 716394d6581b60c75cfdd88b8e5b876f2db88b62 (patch) | |
| tree | a53beef5454c2448634facba386bff552834a4dd /library/std/src | |
| parent | c825bc431ee5b815847b9bab693c59c43986fc4b (diff) | |
| parent | 2d789b6373373e2ca783b5f8691c9ff80da383cf (diff) | |
| download | rust-716394d6581b60c75cfdd88b8e5b876f2db88b62.tar.gz rust-716394d6581b60c75cfdd88b8e5b876f2db88b62.zip | |
Auto merge of #84862 - GuillaumeGomez:rollup-cbc93h4, r=GuillaumeGomez
Rollup of 6 pull requests Successful merges: - #84835 (Add link to Issue #34202 in udp docs) - #84852 (Change librustdoc write!(.. \n) to writeln!(..); fix comment grammar) - #84854 (use double quotes and full path for E0761) - #84856 (Correct stability of ErrorKind::OutOfMemory) - #84858 (Fix stability attributes of byte-to-string specialization) - #84860 (Link to MCP from target tier policy) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/io/error.rs | 2 | ||||
| -rw-r--r-- | library/std/src/net/udp.rs | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/library/std/src/io/error.rs b/library/std/src/io/error.rs index ae896d1240e..56e6f08268c 100644 --- a/library/std/src/io/error.rs +++ b/library/std/src/io/error.rs @@ -189,7 +189,7 @@ pub enum ErrorKind { /// An operation could not be completed, because it failed /// to allocate enough memory. - #[stable(feature = "out_of_memory_error", since = "1.53.0")] + #[stable(feature = "out_of_memory_error", since = "1.54.0")] OutOfMemory, } diff --git a/library/std/src/net/udp.rs b/library/std/src/net/udp.rs index b9af5992dff..18297139b7b 100644 --- a/library/std/src/net/udp.rs +++ b/library/std/src/net/udp.rs @@ -159,7 +159,7 @@ impl UdpSocket { /// This will return an error when the IP version of the local socket /// does not match that returned from [`ToSocketAddrs`]. /// - /// See issue #34202 for more details. + /// See [Issue #34202] for more details. /// /// # Examples /// @@ -169,6 +169,8 @@ impl UdpSocket { /// let socket = UdpSocket::bind("127.0.0.1:34254").expect("couldn't bind to address"); /// socket.send_to(&[0; 10], "127.0.0.1:4242").expect("couldn't send data"); /// ``` + /// + /// [Issue #34202]: https://github.com/rust-lang/rust/issues/34202 #[stable(feature = "rust1", since = "1.0.0")] pub fn send_to<A: ToSocketAddrs>(&self, buf: &[u8], addr: A) -> io::Result<usize> { match addr.to_socket_addrs()?.next() { |