diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2016-08-05 16:12:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-05 16:12:54 +0200 |
| commit | e377049262313dea8a286c93cd71630796ade0de (patch) | |
| tree | 1b09eb048993655a3b3c127b58f924c42a50908a | |
| parent | 7971a93698fa86d3e345b33a3ae4c3a0601ab35b (diff) | |
| parent | f2d8db15dfe9b715f0e0a957440d79945270a20f (diff) | |
| download | rust-e377049262313dea8a286c93cd71630796ade0de.tar.gz rust-e377049262313dea8a286c93cd71630796ade0de.zip | |
Rollup merge of #35175 - frewsxcv:tcp, r=GuillaumeGomez
A couple `std::net` doc improvements. None
| -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 } |
