cargo fmt

This commit is contained in:
sharks
2018-04-15 21:15:30 -05:00
parent 811cab642e
commit 15fa093618
5 changed files with 18 additions and 13 deletions

View File

@ -1,6 +1,6 @@
use std::net::Ipv4Addr;
use std::fmt;
use std::error::Error; use std::error::Error;
use std::fmt;
use std::net::Ipv4Addr;
/// Represents a bunch of errors that can occur while working with a `IpNetwork` /// Represents a bunch of errors that can occur while working with a `IpNetwork`
#[derive(Debug, Clone, PartialEq, Eq)] #[derive(Debug, Clone, PartialEq, Eq)]

View File

@ -243,10 +243,10 @@ pub fn ipv4_mask_to_prefix(mask: Ipv4Addr) -> Result<u8, IpNetworkError> {
#[cfg(test)] #[cfg(test)]
mod test { mod test {
use std::mem;
use std::collections::HashMap;
use std::net::Ipv4Addr;
use super::*; use super::*;
use std::collections::HashMap;
use std::mem;
use std::net::Ipv4Addr;
#[test] #[test]
fn create_v4() { fn create_v4() {

View File

@ -253,8 +253,8 @@ pub fn ipv6_mask_to_prefix(mask: Ipv6Addr) -> Result<u8, IpNetworkError> {
#[cfg(test)] #[cfg(test)]
mod test { mod test {
use std::net::Ipv6Addr;
use super::*; use super::*;
use std::net::Ipv6Addr;
#[test] #[test]
fn create_v6() { fn create_v6() {

View File

@ -17,15 +17,15 @@ extern crate serde_derive;
use std::fmt; use std::fmt;
use std::net::IpAddr; use std::net::IpAddr;
mod common;
mod ipv4; mod ipv4;
mod ipv6; mod ipv6;
mod common;
use std::str::FromStr; use std::str::FromStr;
pub use ipv4::{Ipv4Network, ipv4_mask_to_prefix};
pub use ipv6::{Ipv6Network, ipv6_mask_to_prefix};
pub use common::IpNetworkError; pub use common::IpNetworkError;
pub use ipv4::{ipv4_mask_to_prefix, Ipv4Network};
pub use ipv6::{ipv6_mask_to_prefix, Ipv6Network};
/// Represents a generic network range. This type can have two variants: /// Represents a generic network range. This type can have two variants:
/// the v4 and the v6 case. /// the v4 and the v6 case.

View File

@ -8,7 +8,6 @@ extern crate serde_derive;
extern crate ipnetwork; extern crate ipnetwork;
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
@ -45,7 +44,10 @@ mod tests {
let mystruct: MyStruct = ::serde_json::from_str(json_string).unwrap(); let mystruct: MyStruct = ::serde_json::from_str(json_string).unwrap();
assert_eq!(mystruct.ipnetwork.ip(), Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 1)); assert_eq!(
mystruct.ipnetwork.ip(),
Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 1)
);
assert_eq!(mystruct.ipnetwork.prefix(), 0); assert_eq!(mystruct.ipnetwork.prefix(), 0);
assert_eq!(::serde_json::to_string(&mystruct).unwrap(), json_string); assert_eq!(::serde_json::to_string(&mystruct).unwrap(), json_string);
@ -65,9 +67,12 @@ mod tests {
assert_eq!(mystruct.ipnetwork[0].ip(), Ipv4Addr::new(127, 1, 0, 0)); assert_eq!(mystruct.ipnetwork[0].ip(), Ipv4Addr::new(127, 1, 0, 0));
assert_eq!(mystruct.ipnetwork[0].prefix(), 24); assert_eq!(mystruct.ipnetwork[0].prefix(), 24);
assert_eq!(mystruct.ipnetwork[1].ip(), Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 1)); assert_eq!(
mystruct.ipnetwork[1].ip(),
Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 1)
);
assert_eq!(mystruct.ipnetwork[1].prefix(), 0); assert_eq!(mystruct.ipnetwork[1].prefix(), 0);
assert_eq!(::serde_json::to_string(&mystruct).unwrap(), json_string); assert_eq!(::serde_json::to_string(&mystruct).unwrap(), json_string);
} }
} }