bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #75036 - lzutao:pat, r=cuviper

Browse source 
Prefer pattern matching over indexing

Quite a bit nicer IMO.

r? @cuviper
This commit is contained in:
Tyler Mandry 2020-08-11 12:28:30 -07:00 • committed by GitHub
commit dcccb47cb8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
library/std/src/net/ip.rs
View file

@ -767,10 +767,8 @@ impl Ipv4Addr {
/// ``` /// ```
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
pub fn to_ipv6_compatible(&self) -> Ipv6Addr { pub fn to_ipv6_compatible(&self) -> Ipv6Addr {
let octets = self.octets(); let [a, b, c, d] = self.octets();
Ipv6Addr::from([ Ipv6Addr::from([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, a, b, c, d])
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, octets[0], octets[1], octets[2], octets[3],
])
} }
/// Converts this address to an IPv4-mapped [IPv6 address]. /// Converts this address to an IPv4-mapped [IPv6 address].
@ -789,10 +787,8 @@ impl Ipv4Addr {
/// ``` /// ```
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
pub fn to_ipv6_mapped(&self) -> Ipv6Addr { pub fn to_ipv6_mapped(&self) -> Ipv6Addr {
let octets = self.octets(); let [a, b, c, d] = self.octets();
Ipv6Addr::from([ Ipv6Addr::from([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFF, 0xFF, a, b, c, d])
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFF, 0xFF, octets[0], octets[1], octets[2], octets[3],
])
} }
} }
@ -1498,11 +1494,12 @@ impl Ipv6Addr {
/// ``` /// ```
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
pub fn to_ipv4(&self) -> Option<Ipv4Addr> { pub fn to_ipv4(&self) -> Option<Ipv4Addr> {
match self.segments() { if let [0, 0, 0, 0, 0, 0 | 0xffff, ab, cd] = self.segments() {
[0, 0, 0, 0, 0, f, g, h] if f == 0 || f == 0xffff => { let [a, b] = ab.to_be_bytes();
Some(Ipv4Addr::new((g >> 8) as u8, g as u8, (h >> 8) as u8, h as u8)) let [c, d] = cd.to_be_bytes();
} Some(Ipv4Addr::new(a, b, c, d))
_ => None, } else {
None
} }
} }