From 61eeb5843f07c5c714b25e7af40abe4142f75c80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linus=20F=C3=A4rnstrand?= Date: Mon, 25 Mar 2019 15:15:41 +0100 Subject: [PATCH] Run cargo fix --edition-idioms --- benches/parse_bench.rs | 2 +- src/common.rs | 2 +- src/ipv4.rs | 2 +- src/ipv6.rs | 2 +- src/lib.rs | 4 ++-- tests/test_json.rs | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/benches/parse_bench.rs b/benches/parse_bench.rs index ba2f1c8..c880846 100644 --- a/benches/parse_bench.rs +++ b/benches/parse_bench.rs @@ -1,6 +1,6 @@ #[macro_use] extern crate criterion; -extern crate ipnetwork; + use ipnetwork::{Ipv4Network, Ipv6Network}; use criterion::Criterion; diff --git a/src/common.rs b/src/common.rs index e925fbd..9932bd3 100644 --- a/src/common.rs +++ b/src/common.rs @@ -10,7 +10,7 @@ pub enum IpNetworkError { } impl fmt::Display for IpNetworkError { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { use crate::IpNetworkError::*; match *self { InvalidAddr(ref s) => write!(f, "invalid address: {}", s), diff --git a/src/ipv4.rs b/src/ipv4.rs index 377f9ee..4e97fae 100644 --- a/src/ipv4.rs +++ b/src/ipv4.rs @@ -204,7 +204,7 @@ impl Ipv4Network { } impl fmt::Display for Ipv4Network { - fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { write!(fmt, "{}/{}", self.ip(), self.prefix()) } } diff --git a/src/ipv6.rs b/src/ipv6.rs index bcf3929..21ea4ae 100644 --- a/src/ipv6.rs +++ b/src/ipv6.rs @@ -243,7 +243,7 @@ impl Iterator for Ipv6NetworkIterator { } impl fmt::Display for Ipv6Network { - fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { write!(fmt, "{}/{}", self.ip(), self.prefix()) } } diff --git a/src/lib.rs b/src/lib.rs index c09936d..fecff4f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -6,7 +6,7 @@ #![crate_type = "lib"] #![doc(html_root_url = "https://docs.rs/ipnetwork/0.14.0")] -extern crate serde; + use std::fmt; use std::net::IpAddr; @@ -296,7 +296,7 @@ impl From for IpNetwork { } impl fmt::Display for IpNetwork { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match *self { IpNetwork::V4(net) => net.fmt(f), IpNetwork::V6(net) => net.fmt(f), diff --git a/tests/test_json.rs b/tests/test_json.rs index bcb625b..7dd2ec9 100644 --- a/tests/test_json.rs +++ b/tests/test_json.rs @@ -1,11 +1,11 @@ -extern crate serde; -extern crate serde_json; + + #[macro_use] extern crate serde_derive; -extern crate ipnetwork; + #[cfg(test)] mod tests {