From 21e2506dd64f4f39e5793c1e6123b563d7d0cb2f Mon Sep 17 00:00:00 2001 From: slinkydeveloper Date: Thu, 29 Apr 2021 14:52:52 +0200 Subject: [PATCH] fmt Signed-off-by: Francesco Guardiani --- src/event/attributes.rs | 3 +-- src/event/builder.rs | 4 ++-- src/event/types.rs | 2 +- src/event/v03/attributes.rs | 2 +- src/event/v03/builder.rs | 6 ++---- src/event/v03/format.rs | 2 +- src/event/v10/attributes.rs | 2 +- src/event/v10/builder.rs | 2 +- src/event/v10/format.rs | 2 +- src/message/error.rs | 2 +- src/message/types.rs | 2 +- 11 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/event/attributes.rs b/src/event/attributes.rs index c4070f4e..58d315cb 100644 --- a/src/event/attributes.rs +++ b/src/event/attributes.rs @@ -1,7 +1,6 @@ use super::{ - AttributesIntoIteratorV03, AttributesIntoIteratorV10, AttributesV03, AttributesV10, + types::*, AttributesIntoIteratorV03, AttributesIntoIteratorV10, AttributesV03, AttributesV10, ExtensionValue, SpecVersion, - types::* }; use chrono::{DateTime, Utc}; use serde::Serializer; diff --git a/src/event/builder.rs b/src/event/builder.rs index d033a3ec..9ae7b75c 100644 --- a/src/event/builder.rs +++ b/src/event/builder.rs @@ -1,6 +1,6 @@ -use snafu::Snafu; -use super::Event; use super::types; +use super::Event; +use snafu::Snafu; /// Trait to implement a builder for [`Event`]: /// ``` diff --git a/src/event/types.rs b/src/event/types.rs index 4040b6c4..7ac021eb 100644 --- a/src/event/types.rs +++ b/src/event/types.rs @@ -1,6 +1,6 @@ -pub use self::uri::Uri; pub use self::uri::ParseUriError; pub use self::uri::TryIntoUri; +pub use self::uri::Uri; pub use urireference::UriReference; diff --git a/src/event/v03/attributes.rs b/src/event/v03/attributes.rs index 4bd3e439..a887b9e3 100644 --- a/src/event/v03/attributes.rs +++ b/src/event/v03/attributes.rs @@ -1,7 +1,7 @@ use crate::event::attributes::{default_hostname, AttributeValue, AttributesConverter}; +use crate::event::types::*; use crate::event::{AttributesReader, AttributesV10, AttributesWriter, SpecVersion}; use crate::message::{BinarySerializer, MessageAttributeValue}; -use crate::event::types::*; use uuid::Uuid; pub(crate) const ATTRIBUTE_NAMES: [&str; 8] = [ diff --git a/src/event/v03/builder.rs b/src/event/v03/builder.rs index d867b797..7d005425 100644 --- a/src/event/v03/builder.rs +++ b/src/event/v03/builder.rs @@ -1,9 +1,7 @@ use super::Attributes as AttributesV03; -use crate::event::{ - Attributes, Data, Event, EventBuilderError, ExtensionValue -}; -use crate::message::MessageAttributeValue; use crate::event::types::*; +use crate::event::{Attributes, Data, Event, EventBuilderError, ExtensionValue}; +use crate::message::MessageAttributeValue; use std::collections::HashMap; use std::convert::TryInto; diff --git a/src/event/v03/format.rs b/src/event/v03/format.rs index d3d3b432..1a402ae2 100644 --- a/src/event/v03/format.rs +++ b/src/event/v03/format.rs @@ -1,7 +1,7 @@ use super::Attributes; use crate::event::data::is_json_content_type; -use crate::event::{Data, ExtensionValue}; use crate::event::types::*; +use crate::event::{Data, ExtensionValue}; use serde::de::IntoDeserializer; use serde::ser::SerializeMap; use serde::{Deserialize, Serializer}; diff --git a/src/event/v10/attributes.rs b/src/event/v10/attributes.rs index 630ddcc6..34557d9d 100644 --- a/src/event/v10/attributes.rs +++ b/src/event/v10/attributes.rs @@ -1,7 +1,7 @@ use crate::event::attributes::{default_hostname, AttributeValue, AttributesConverter}; +use crate::event::types::*; use crate::event::{AttributesReader, AttributesV03, AttributesWriter, SpecVersion, UriReference}; use crate::message::{BinarySerializer, MessageAttributeValue}; -use crate::event::types::*; use core::fmt::Debug; use uuid::Uuid; diff --git a/src/event/v10/builder.rs b/src/event/v10/builder.rs index 1568f854..8c86e762 100644 --- a/src/event/v10/builder.rs +++ b/src/event/v10/builder.rs @@ -1,10 +1,10 @@ use super::Attributes as AttributesV10; +use crate::event::types::*; use crate::event::{ Attributes, Data, Event, EventBuilderError, ExtensionValue, TryIntoTime, TryIntoUri, UriReference, }; use crate::message::MessageAttributeValue; -use crate::event::types::*; use std::collections::HashMap; use std::convert::TryInto; diff --git a/src/event/v10/format.rs b/src/event/v10/format.rs index 11f9353d..3719aa71 100644 --- a/src/event/v10/format.rs +++ b/src/event/v10/format.rs @@ -1,7 +1,7 @@ use super::Attributes; use crate::event::data::is_json_content_type; -use crate::event::{Data, ExtensionValue}; use crate::event::types::*; +use crate::event::{Data, ExtensionValue}; use serde::de::IntoDeserializer; use serde::ser::SerializeMap; use serde::{Deserialize, Serializer}; diff --git a/src/message/error.rs b/src/message/error.rs index 09dfbd53..8e478f31 100644 --- a/src/message/error.rs +++ b/src/message/error.rs @@ -1,5 +1,5 @@ -use snafu::Snafu; use crate::event::types; +use snafu::Snafu; /// Represents an error during serialization/deserialization process #[derive(Debug, Snafu)] diff --git a/src/message/types.rs b/src/message/types.rs index ddadb98c..4067a36f 100644 --- a/src/message/types.rs +++ b/src/message/types.rs @@ -1,7 +1,7 @@ +use crate::event::types::*; use crate::event::ExtensionValue; use std::convert::TryInto; use std::fmt; -use crate::event::types::*; /// Union type representing a [CloudEvent context attribute type](https://github.com/cloudevents/spec/blob/v1.0/spec.md#type-system). #[derive(PartialEq, Eq, Debug, Clone)]