user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add From<(I, u16)> for SocketAddr where I: Into<IpAddr>

Browse source
This commit is contained in:
Sean McArthur 2017-01-28 12:54:09 -08:00
parent 87dcbcada2
commit cd603e4324
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libstd/net/addr.rs
View file

@ -456,6 +456,13 @@ impl From<SocketAddrV6> for SocketAddr {
}
}
#[stable(feature = "addr_from_into_ip", since = "1.17.0")]
impl<I: Into<IpAddr>> From<(I, u16)> for SocketAddr {
fn from(pieces: (I, u16)) -> SocketAddr {
SocketAddr::new(pieces.0.into(), pieces.1)
}
}
impl<'a> IntoInner<(*const c::sockaddr, c::socklen_t)> for &'a SocketAddr {
fn into_inner(self) -> (*const c::sockaddr, c::socklen_t) {
match *self {

4
src/libstd/net/ip.rs
View file

@ -1183,8 +1183,8 @@ impl From<[u8; 16]> for IpAddr {
#[stable(feature = "ip_from_slice", since = "1.17.0")]
impl From<[u16; 8]> for IpAddr {
fn from(octets: [u16; 8]) -> IpAddr {
IpAddr::V6(Ipv6Addr::from(octets))
fn from(segments: [u16; 8]) -> IpAddr {
IpAddr::V6(Ipv6Addr::from(segments))
}
}