From 761a87cc6e64990b9dd0e235047e1d1e7c7d6971 Mon Sep 17 00:00:00 2001 From: Hristo Venev Date: Mon, 18 Mar 2019 12:37:27 +0200 Subject: Lint --- src/proto.rs | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'src/proto.rs') diff --git a/src/proto.rs b/src/proto.rs index e6759a1..a3ee6e6 100644 --- a/src/proto.rs +++ b/src/proto.rs @@ -1,11 +1,10 @@ -use ::std::time::SystemTime; -use ::serde_derive; +use serde_derive; +use std::time::SystemTime; -use crate::ip::{Ipv4Net, Ipv6Net, Endpoint}; +use crate::ip::{Endpoint, Ipv4Net, Ipv6Net}; #[serde(deny_unknown_fields)] -#[derive(serde_derive::Serialize, serde_derive::Deserialize)] -#[derive(Clone, PartialEq, Eq, Debug)] +#[derive(serde_derive::Serialize, serde_derive::Deserialize, Clone, PartialEq, Eq, Debug)] pub struct Peer { pub public_key: String, pub endpoint: Endpoint, @@ -19,14 +18,12 @@ fn default_peer_keepalive() -> u32 { 0 } -#[derive(serde_derive::Serialize, serde_derive::Deserialize)] -#[derive(Clone, PartialEq, Eq, Debug)] +#[derive(serde_derive::Serialize, serde_derive::Deserialize, Clone, PartialEq, Eq, Debug)] pub struct SourceConfig { pub peers: Vec, } -#[derive(serde_derive::Serialize, serde_derive::Deserialize)] -#[derive(Clone, PartialEq, Eq, Debug)] +#[derive(serde_derive::Serialize, serde_derive::Deserialize, Clone, PartialEq, Eq, Debug)] pub struct SourceNextConfig { #[serde(with = "serde_utc")] pub update_at: SystemTime, @@ -34,8 +31,7 @@ pub struct SourceNextConfig { pub config: SourceConfig, } -#[derive(serde_derive::Serialize, serde_derive::Deserialize)] -#[derive(Clone, PartialEq, Eq, Debug)] +#[derive(serde_derive::Serialize, serde_derive::Deserialize, Clone, PartialEq, Eq, Debug)] pub struct Source { #[serde(flatten)] pub config: SourceConfig, @@ -43,10 +39,10 @@ pub struct Source { } mod serde_utc { - use ::std::time::SystemTime; - use ::chrono::{DateTime, TimeZone, Utc, SecondsFormat}; - use ::serde::*; use crate::bin; + use chrono::{DateTime, SecondsFormat, TimeZone, Utc}; + use serde::*; + use std::time::SystemTime; pub fn serialize(t: &SystemTime, ser: S) -> Result { let t = DateTime::::from(*t); -- cgit