diff options
| author | bors <bors@rust-lang.org> | 2017-08-11 09:37:52 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-08-11 09:37:52 +0000 |
| commit | 59675d29eb47eb743026dcc0737884f548f2197a (patch) | |
| tree | 44a9c4ea0b551956de3697ed63d1e57cd4dbeb8f /src/libstd/sys | |
| parent | 9868352b953dc88975324b27e2865d5ee2ea72e9 (diff) | |
| parent | 742bba0ebfa26f65d9aca239edaf5b0aad8fa9e2 (diff) | |
| download | rust-59675d29eb47eb743026dcc0737884f548f2197a.tar.gz rust-59675d29eb47eb743026dcc0737884f548f2197a.zip | |
Auto merge of #43800 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 18 pull requests - Successful merges: #43176, #43632, #43650, #43712, #43715, #43721, #43739, #43741, #43744, #43747, #43752, #43760, #43773, #43779, #43783, #43791, #43793, #43795 - Failed merges:
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/unix/ext/net.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys/unix/ext/net.rs b/src/libstd/sys/unix/ext/net.rs index 94b87a6bff4..7701ae25b41 100644 --- a/src/libstd/sys/unix/ext/net.rs +++ b/src/libstd/sys/unix/ext/net.rs @@ -655,7 +655,7 @@ impl UnixListener { /// Accepts a new incoming connection to this listener. /// /// This function will block the calling thread until a new Unix connection - /// is established. When established, the corersponding [`UnixStream`] and + /// is established. When established, the corresponding [`UnixStream`] and /// the remote peer's address will be returned. /// /// [`UnixStream`]: ../../../../std/os/unix/net/struct.UnixStream.html |