about summary refs log tree commit diff
path: root/src/libstd/net
diff options
context:
space:
mode:
authorSteven Fackler <sfackler@gmail.com>2017-05-10 21:17:24 -0700
committerSteven Fackler <sfackler@gmail.com>2017-05-20 21:58:47 -0700
commit7c2cd93b2bf3c84b97ea798617105a6f85529d23 (patch)
tree0eee8e5518460e34ae3f1183fc137d8d79147ed9 /src/libstd/net
parentd8215fc238a974950fcd4155a34f5383ebb589b9 (diff)
downloadrust-7c2cd93b2bf3c84b97ea798617105a6f85529d23.tar.gz
rust-7c2cd93b2bf3c84b97ea798617105a6f85529d23.zip
Stabilize library features for 1.18.0
Closes #38863
Closes #38980
Closes #38903
Closes #36648
Diffstat (limited to 'src/libstd/net')
-rw-r--r--src/libstd/net/tcp.rs3
-rw-r--r--src/libstd/net/udp.rs6
2 files changed, 3 insertions, 6 deletions
diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs
index 34229f80769..c1493c9c6f4 100644
--- a/src/libstd/net/tcp.rs
+++ b/src/libstd/net/tcp.rs
@@ -343,7 +343,6 @@ impl TcpStream {
     /// # Examples
     ///
     /// ```no_run
-    /// #![feature(peek)]
     /// use std::net::TcpStream;
     ///
     /// let stream = TcpStream::connect("127.0.0.1:8000")
@@ -351,7 +350,7 @@ impl TcpStream {
     /// let mut buf = [0; 10];
     /// let len = stream.peek(&mut buf).expect("peek failed");
     /// ```
-    #[unstable(feature = "peek", issue = "38980")]
+    #[stable(feature = "peek", since = "1.18.0")]
     pub fn peek(&self, buf: &mut [u8]) -> io::Result<usize> {
         self.0.peek(buf)
     }
diff --git a/src/libstd/net/udp.rs b/src/libstd/net/udp.rs
index cdf04f7f1a4..80151dc2b44 100644
--- a/src/libstd/net/udp.rs
+++ b/src/libstd/net/udp.rs
@@ -112,7 +112,6 @@ impl UdpSocket {
     /// # Examples
     ///
     /// ```no_run
-    /// #![feature(peek)]
     /// use std::net::UdpSocket;
     ///
     /// let socket = UdpSocket::bind("127.0.0.1:34254").expect("couldn't bind to address");
@@ -120,7 +119,7 @@ impl UdpSocket {
     /// let (number_of_bytes, src_addr) = socket.peek_from(&mut buf)
     ///                                         .expect("Didn't receive data");
     /// ```
-    #[unstable(feature = "peek", issue = "38980")]
+    #[stable(feature = "peek", since = "1.18.0")]
     pub fn peek_from(&self, buf: &mut [u8]) -> io::Result<(usize, SocketAddr)> {
         self.0.peek_from(buf)
     }
@@ -638,7 +637,6 @@ impl UdpSocket {
     /// # Examples
     ///
     /// ```no_run
-    /// #![feature(peek)]
     /// use std::net::UdpSocket;
     ///
     /// let socket = UdpSocket::bind("127.0.0.1:34254").expect("couldn't bind to address");
@@ -649,7 +647,7 @@ impl UdpSocket {
     ///     Err(e) => println!("peek function failed: {:?}", e),
     /// }
     /// ```
-    #[unstable(feature = "peek", issue = "38980")]
+    #[stable(feature = "peek", since = "1.18.0")]
     pub fn peek(&self, buf: &mut [u8]) -> io::Result<usize> {
         self.0.peek(buf)
     }