File tree 2 files changed +9
-2
lines changed
2 files changed +9
-2
lines changed Original file line number Diff line number Diff line change @@ -456,6 +456,13 @@ impl From<SocketAddrV6> for SocketAddr {
456
456
}
457
457
}
458
458
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
+
459
466
impl < ' a > IntoInner < ( * const c:: sockaddr , c:: socklen_t ) > for & ' a SocketAddr {
460
467
fn into_inner ( self ) -> ( * const c:: sockaddr , c:: socklen_t ) {
461
468
match * self {
Original file line number Diff line number Diff line change @@ -1183,8 +1183,8 @@ impl From<[u8; 16]> for IpAddr {
1183
1183
1184
1184
#[ stable( feature = "ip_from_slice" , since = "1.17.0" ) ]
1185
1185
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 ) )
1188
1188
}
1189
1189
}
1190
1190
You can’t perform that action at this time.
0 commit comments