diff options
| author | bors <bors@rust-lang.org> | 2016-08-11 13:14:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-11 13:14:28 -0700 |
| commit | 8787a12334439d47e931be26fef53381ce337c3a (patch) | |
| tree | fddfaef8f238490b3801ccb14222c31c01944e3f /src/libstd/sys | |
| parent | 11f880588791930cb130071c2cb972fc3c3354ed (diff) | |
| parent | d3af9a38eda71e6440423a1627f216acc0cc45f4 (diff) | |
| download | rust-8787a12334439d47e931be26fef53381ce337c3a.tar.gz rust-8787a12334439d47e931be26fef53381ce337c3a.zip | |
Auto merge of #35592 - jonathandturner:rollup, r=jonathandturner
Rollup of 23 pull requests - Successful merges: #35279, #35331, #35358, #35375, #35445, #35448, #35482, #35486, #35505, #35528, #35530, #35532, #35536, #35537, #35541, #35552, #35554, #35555, #35557, #35562, #35565, #35569, #35576 - Failed merges: #35395, #35415, #35563
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 b5287cce484..a4564b9543b 100644 --- a/src/libstd/sys/unix/ext/net.rs +++ b/src/libstd/sys/unix/ext/net.rs @@ -110,7 +110,7 @@ impl SocketAddr { }) } - /// Returns true iff the address is unnamed. + /// Returns true if and only if the address is unnamed. #[stable(feature = "unix_socket", since = "1.10.0")] pub fn is_unnamed(&self) -> bool { if let AddressKind::Unnamed = self.address() { |