diff options
| author | Yamakaky <yamakaky@yamaworld.fr> | 2016-12-12 15:34:09 -0500 |
|---|---|---|
| committer | Yamakaky <yamakaky@yamaworld.fr> | 2016-12-24 23:32:54 -0500 |
| commit | 40053a46ff3b5d7a516d1f91e89cd928cf253347 (patch) | |
| tree | 4a8865d219119340d6a9821c047d4264f5897d56 /src/libstd/net | |
| parent | e60aa62ffe7462d48cb44ab33f2551b466745e83 (diff) | |
| download | rust-40053a46ff3b5d7a516d1f91e89cd928cf253347.tar.gz rust-40053a46ff3b5d7a516d1f91e89cd928cf253347.zip | |
Impl From<Ipv4Addr, Ipv6Addr> for IpAddr.
Fixes https://github.com/rust-lang/rfcs/issues/1816.
Diffstat (limited to 'src/libstd/net')
| -rw-r--r-- | src/libstd/net/ip.rs | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/libstd/net/ip.rs b/src/libstd/net/ip.rs index 6aab7486004..36a1aed8400 100644 --- a/src/libstd/net/ip.rs +++ b/src/libstd/net/ip.rs @@ -524,6 +524,18 @@ impl fmt::Display for IpAddr { } } +impl From<Ipv4Addr> for IpAddr { + fn from(ipv4: Ipv4Addr) -> IpAddr { + IpAddr::V4(ipv4) + } +} + +impl From<Ipv6Addr> for IpAddr { + fn from(ipv6: Ipv6Addr) -> IpAddr { + IpAddr::V6(ipv6) + } +} + #[stable(feature = "rust1", since = "1.0.0")] impl fmt::Display for Ipv4Addr { fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { |