Kieran/ipnetwork
1
0
Fork 0
mirror of https://github.com/achanda/ipnetwork.git synced 2025-06-16 16:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

cargo fmt and clippy

Browse Source
This commit is contained in:
sharks
2018-04-17 19:28:45 -05:00
parent c6ead9d654
commit 2286d58728
2 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ipv4.rs
View File

@ -41,10 +41,7 @@ impl Ipv4Network {
if prefix > IPV4_BITS { if prefix > IPV4_BITS {
Err(IpNetworkError::InvalidPrefix) Err(IpNetworkError::InvalidPrefix)
} else { } else {
Ok(Ipv4Network { Ok(Ipv4Network { addr, prefix })
addr: addr,
prefix: prefix,
})
} }
} }
@ -54,10 +51,7 @@ impl Ipv4Network {
pub fn iter(&self) -> Ipv4NetworkIterator { pub fn iter(&self) -> Ipv4NetworkIterator {
let start = u64::from(u32::from(self.network())); let start = u64::from(u32::from(self.network()));
let end = start + self.size(); let end = start + self.size();
Ipv4NetworkIterator { Ipv4NetworkIterator { next: start, end }
next: start,
end: end,
}
} }
pub fn ip(&self) -> Ipv4Addr { pub fn ip(&self) -> Ipv4Addr {
@ -254,7 +248,7 @@ pub fn ipv4_mask_to_prefix(mask: Ipv4Addr) -> Result<u8, IpNetworkError> {
let mask = u32::from(mask); let mask = u32::from(mask);
let prefix = (!mask).leading_zeros() as u8; let prefix = (!mask).leading_zeros() as u8;
if ((mask as u64) << prefix) & 0xffff_ffff != 0 { if (u64::from(mask) << prefix) & 0xffff_ffff != 0 {
Err(IpNetworkError::InvalidPrefix) Err(IpNetworkError::InvalidPrefix)
} else { } else {
Ok(prefix) Ok(prefix)

5
src/ipv6.rs
View File

@ -43,10 +43,7 @@ impl Ipv6Network {
if prefix > IPV6_BITS { if prefix > IPV6_BITS {
Err(IpNetworkError::InvalidPrefix) Err(IpNetworkError::InvalidPrefix)
} else { } else {
Ok(Ipv6Network { Ok(Ipv6Network { addr, prefix })
addr: addr,
prefix: prefix,
})
} }
} }