Skip to content

Commit cd603e4

Browse files
committed
add From<(I, u16)> for SocketAddr where I: Into<IpAddr>
1 parent 87dcbca commit cd603e4

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

src/libstd/net/addr.rs

+7
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,13 @@ impl From<SocketAddrV6> for SocketAddr {
456456
}
457457
}
458458

459+
#[stable(feature = "addr_from_into_ip", since = "1.17.0")]
460+
impl<I: Into<IpAddr>> From<(I, u16)> for SocketAddr {
461+
fn from(pieces: (I, u16)) -> SocketAddr {
462+
SocketAddr::new(pieces.0.into(), pieces.1)
463+
}
464+
}
465+
459466
impl<'a> IntoInner<(*const c::sockaddr, c::socklen_t)> for &'a SocketAddr {
460467
fn into_inner(self) -> (*const c::sockaddr, c::socklen_t) {
461468
match *self {

src/libstd/net/ip.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1183,8 +1183,8 @@ impl From<[u8; 16]> for IpAddr {
11831183

11841184
#[stable(feature = "ip_from_slice", since = "1.17.0")]
11851185
impl From<[u16; 8]> for IpAddr {
1186-
fn from(octets: [u16; 8]) -> IpAddr {
1187-
IpAddr::V6(Ipv6Addr::from(octets))
1186+
fn from(segments: [u16; 8]) -> IpAddr {
1187+
IpAddr::V6(Ipv6Addr::from(segments))
11881188
}
11891189
}
11901190

0 commit comments

Comments
 (0)