about summary refs log tree commit diff
path: root/src/libstd/net/mod.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-11-18 19:49:33 +0000
committerbors <bors@rust-lang.org>2015-11-18 19:49:33 +0000
commit22e31f10c22112b486f4999f90e4ba9c7e23b9b6 (patch)
tree28e9ca0bf181ccff4f1e5fa6e929c1c714df9ce7 /src/libstd/net/mod.rs
parent3c68f646e957065fe5fabd4af850abaa8c4ee0af (diff)
parent64b90f81c3ec2cf5564ed8456d836516491b9d01 (diff)
downloadrust-22e31f10c22112b486f4999f90e4ba9c7e23b9b6.tar.gz
rust-22e31f10c22112b486f4999f90e4ba9c7e23b9b6.zip
Auto merge of #29083 - petrochenkov:stability3, r=alexcrichton
What this patch does:
- Stability annotations are now based on "exported items" supplied by rustc_privacy and not "public items". Exported items are as accessible for external crates as directly public items and should be annotated with stability attributes.
- Trait impls require annotations now.
- Reexports require annotations now.
- Crates themselves didn't require annotations, now they do.
- Exported macros are annotated now, but these annotations are not used yet.
- Some useless annotations are detected and result in errors
- Finally, some small bugs are fixed - deprecation propagates from stable deprecated parents, items in blocks are traversed correctly (fixes https://github.com/rust-lang/rust/issues/29034) + some code cleanup.
Diffstat (limited to 'src/libstd/net/mod.rs')
-rw-r--r--src/libstd/net/mod.rs5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/libstd/net/mod.rs b/src/libstd/net/mod.rs
index 8a02d37c89b..383dce737f5 100644
--- a/src/libstd/net/mod.rs
+++ b/src/libstd/net/mod.rs
@@ -17,10 +17,15 @@ use prelude::v1::*;
 use io::{self, Error, ErrorKind};
 use sys_common::net as net_imp;
 
+#[stable(feature = "rust1", since = "1.0.0")]
 pub use self::ip::{IpAddr, Ipv4Addr, Ipv6Addr, Ipv6MulticastScope};
+#[stable(feature = "rust1", since = "1.0.0")]
 pub use self::addr::{SocketAddr, SocketAddrV4, SocketAddrV6, ToSocketAddrs};
+#[stable(feature = "rust1", since = "1.0.0")]
 pub use self::tcp::{TcpStream, TcpListener, Incoming};
+#[stable(feature = "rust1", since = "1.0.0")]
 pub use self::udp::UdpSocket;
+#[stable(feature = "rust1", since = "1.0.0")]
 pub use self::parser::AddrParseError;
 
 mod ip;