diff --git a/benches/parse_bench.rs b/benches/parse_bench.rs index c880846..0e3341c 100644 --- a/benches/parse_bench.rs +++ b/benches/parse_bench.rs @@ -1,10 +1,5 @@ -#[macro_use] -extern crate criterion; - - +use criterion::{criterion_group, criterion_main, Criterion}; use ipnetwork::{Ipv4Network, Ipv6Network}; -use criterion::Criterion; - use std::net::{Ipv4Addr, Ipv6Addr}; fn parse_ipv4_benchmark(c: &mut Criterion) { diff --git a/src/common.rs b/src/common.rs index 9932bd3..ac52028 100644 --- a/src/common.rs +++ b/src/common.rs @@ -1,5 +1,4 @@ -use std::error::Error; -use std::fmt; +use std::{error::Error, fmt}; /// Represents a bunch of errors that can occur while working with a `IpNetwork` #[derive(Debug, Clone, PartialEq, Eq)] diff --git a/src/ipv4.rs b/src/ipv4.rs index 4e97fae..9051d7a 100644 --- a/src/ipv4.rs +++ b/src/ipv4.rs @@ -1,10 +1,6 @@ -use std::fmt; -use std::net::Ipv4Addr; -use std::str::FromStr; - -use serde::{de, Deserialize, Deserializer, Serialize, Serializer}; - use crate::common::{cidr_parts, parse_prefix, IpNetworkError}; +use serde::{de, Deserialize, Deserializer, Serialize, Serializer}; +use std::{fmt, net::Ipv4Addr, str::FromStr}; const IPV4_BITS: u8 = 32; diff --git a/src/ipv6.rs b/src/ipv6.rs index 21ea4ae..e5667bb 100644 --- a/src/ipv6.rs +++ b/src/ipv6.rs @@ -1,11 +1,6 @@ -use std::cmp; -use std::fmt; -use std::net::Ipv6Addr; -use std::str::FromStr; - -use serde::{de, Deserialize, Deserializer, Serialize, Serializer}; - use crate::common::{cidr_parts, parse_prefix, IpNetworkError}; +use serde::{de, Deserialize, Deserializer, Serialize, Serializer}; +use std::{cmp, fmt, net::Ipv6Addr, str::FromStr}; const IPV6_BITS: u8 = 128; const IPV6_SEGMENT_BITS: u8 = 16; diff --git a/src/lib.rs b/src/lib.rs index fecff4f..9910edf 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -6,19 +6,13 @@ #![crate_type = "lib"] #![doc(html_root_url = "https://docs.rs/ipnetwork/0.14.0")] - - -use std::fmt; -use std::net::IpAddr; +use serde::{de, Deserialize, Deserializer, Serialize, Serializer}; +use std::{fmt, net::IpAddr, str::FromStr}; mod common; mod ipv4; mod ipv6; -use std::str::FromStr; - -use serde::{de, Deserialize, Deserializer, Serialize, Serializer}; - pub use crate::common::IpNetworkError; pub use crate::ipv4::{ipv4_mask_to_prefix, Ipv4Network}; pub use crate::ipv6::{ipv6_mask_to_prefix, Ipv6Network}; diff --git a/tests/test_json.rs b/tests/test_json.rs index 7dd2ec9..aaf511e 100644 --- a/tests/test_json.rs +++ b/tests/test_json.rs @@ -1,16 +1,7 @@ - - - - -#[macro_use] -extern crate serde_derive; - - - #[cfg(test)] mod tests { - use ipnetwork::{IpNetwork, Ipv4Network, Ipv6Network}; + use serde_derive::{Deserialize, Serialize}; use std::net::{Ipv4Addr, Ipv6Addr}; #[test]