diff options
| author | bors <bors@rust-lang.org> | 2016-08-05 07:37:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-05 07:37:16 -0700 |
| commit | b30eff7ba72a78e31acd61a2b6931919a0ad62e8 (patch) | |
| tree | 7261c377c72620cd6cd3d668cdbb7a7236469d58 /src/libstd/net | |
| parent | 4c02363852e6ce41cf2da1b43a32cb7780a9b067 (diff) | |
| parent | cd48161e2ca866ef05a076181225cb041c679994 (diff) | |
| download | rust-b30eff7ba72a78e31acd61a2b6931919a0ad62e8.tar.gz rust-b30eff7ba72a78e31acd61a2b6931919a0ad62e8.zip | |
Auto merge of #35365 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 30 pull requests - Successful merges: #34319, #35041, #35042, #35076, #35109, #35137, #35175, #35181, #35182, #35189, #35239, #35264, #35266, #35281, #35285, #35289, #35291, #35294, #35296, #35297, #35298, #35299, #35318, #35319, #35324, #35326, #35328, #35333, #35359, #35362 - Failed merges:
Diffstat (limited to 'src/libstd/net')
| -rw-r--r-- | src/libstd/net/mod.rs | 6 | ||||
| -rw-r--r-- | src/libstd/net/tcp.rs | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/libstd/net/mod.rs b/src/libstd/net/mod.rs index ac13b23ebee..11a16b27113 100644 --- a/src/libstd/net/mod.rs +++ b/src/libstd/net/mod.rs @@ -35,7 +35,11 @@ mod udp; mod parser; #[cfg(test)] mod test; -/// Possible values which can be passed to the `shutdown` method of `TcpStream`. +/// Possible values which can be passed to the [`shutdown`] method of +/// [`TcpStream`]. +/// +/// [`shutdown`]: struct.TcpStream.html#method.shutdown +/// [`TcpStream`]: struct.TcpStream.html #[derive(Copy, Clone, PartialEq, Debug)] #[stable(feature = "rust1", since = "1.0.0")] pub enum Shutdown { diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs index 5ab0d5a0877..76617f15970 100644 --- a/src/libstd/net/tcp.rs +++ b/src/libstd/net/tcp.rs @@ -77,6 +77,11 @@ pub struct TcpListener(net_imp::TcpListener); /// /// This iterator will infinitely yield `Some` of the accepted connections. It /// is equivalent to calling `accept` in a loop. +/// +/// This `struct` is created by the [`incoming`] method on [`TcpListener`]. +/// +/// [`incoming`]: struct.TcpListener.html#method.incoming +/// [`TcpListener`]: struct.TcpListener.html #[stable(feature = "rust1", since = "1.0.0")] pub struct Incoming<'a> { listener: &'a TcpListener } |
