summary refs log tree commit diff
path: root/src/libstd/net
diff options
context:
space:
mode:
authorSon <leson.phung@gmail.com>2018-08-21 10:51:12 +1000
committerSon <leson.phung@gmail.com>2018-08-21 10:51:12 +1000
commit4ced4f339599d1f2f137cb23b9b1c4aeb081e200 (patch)
tree0734bca43c4dfe160affbd3e32c0c07084f73215 /src/libstd/net
parent6bf6d50a6ff7685b4aa09172d9d09f03f250da9d (diff)
downloadrust-4ced4f339599d1f2f137cb23b9b1c4aeb081e200.tar.gz
rust-4ced4f339599d1f2f137cb23b9b1c4aeb081e200.zip
Add doc for impl From for Addr
Diffstat (limited to 'src/libstd/net')
-rw-r--r--src/libstd/net/addr.rs8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/libstd/net/addr.rs b/src/libstd/net/addr.rs
index e80c3eeb876..ff35325ab4f 100644
--- a/src/libstd/net/addr.rs
+++ b/src/libstd/net/addr.rs
@@ -554,6 +554,7 @@ impl FromInner<c::sockaddr_in6> for SocketAddrV6 {
 
 #[stable(feature = "ip_from_ip", since = "1.16.0")]
 impl From<SocketAddrV4> for SocketAddr {
+    /// Converts a [`SocketAddrV4`] into a [`SocketAddr::V4`].
     fn from(sock4: SocketAddrV4) -> SocketAddr {
         SocketAddr::V4(sock4)
     }
@@ -561,6 +562,7 @@ impl From<SocketAddrV4> for SocketAddr {
 
 #[stable(feature = "ip_from_ip", since = "1.16.0")]
 impl From<SocketAddrV6> for SocketAddr {
+    /// Converts a [`SocketAddrV6`] into a [`SocketAddr::V6`].
     fn from(sock6: SocketAddrV6) -> SocketAddr {
         SocketAddr::V6(sock6)
     }
@@ -568,6 +570,12 @@ impl From<SocketAddrV6> for SocketAddr {
 
 #[stable(feature = "addr_from_into_ip", since = "1.17.0")]
 impl<I: Into<IpAddr>> From<(I, u16)> for SocketAddr {
+    /// Converts a tuple struct (Into<[`IpAddr`]>, `u16`) into a [`SocketAddr`].
+    ///
+    /// This conversion creates a [`SocketAddr::V4`] for a [`IpAddr::V4`]
+    /// and creates a [`SocketAddr::V6`] for a [`IpAddr::V6`].
+    ///
+    /// `u16` is treated as port of the newly created [`SocketAddr`].
     fn from(pieces: (I, u16)) -> SocketAddr {
         SocketAddr::new(pieces.0.into(), pieces.1)
     }