about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2015-05-17 11:55:40 +0530
committerManish Goregaokar <manishsmail@gmail.com>2015-05-17 11:55:40 +0530
commita0815c8c747eb63adec7b863047c0f176eafce94 (patch)
tree4822093f18d67cd2acbbded5d23c2f1b1eeeacfc /src/libstd
parent99ed2c9f4b10d86edce0e239acfd5769fd7f7214 (diff)
parente5e722bd3244c927fb672850805c3b3f3bd46e79 (diff)
Rollup merge of #25522 - alexcrichton:reexport-incoming, r=sfackler
This iterator was mistakenly not reexported at the top level, preventing
actually naming the type!

Closes #25519
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/net/mod.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/net/mod.rs b/src/libstd/net/mod.rs
index bff9774bcd0..a79a451305d 100644
--- a/src/libstd/net/mod.rs
+++ b/src/libstd/net/mod.rs
@@ -19,7 +19,7 @@ use sys_common::net as net_imp;
 
 pub use self::ip::{IpAddr, Ipv4Addr, Ipv6Addr, Ipv6MulticastScope};
 pub use self::addr::{SocketAddr, SocketAddrV4, SocketAddrV6, ToSocketAddrs};
-pub use self::tcp::{TcpStream, TcpListener};
+pub use self::tcp::{TcpStream, TcpListener, Incoming};
 pub use self::udp::UdpSocket;
 pub use self::parser::AddrParseError;