diff --git a/instant-xml-macros/src/case.rs b/instant-xml-macros/src/case.rs index aeef600..516a0b9 100644 --- a/instant-xml-macros/src/case.rs +++ b/instant-xml-macros/src/case.rs @@ -5,7 +5,6 @@ // See https://users.rust-lang.org/t/psa-dealing-with-warning-unused-import-std-ascii-asciiext-in-today-s-nightly/13726 #[allow(deprecated, unused_imports)] use std::ascii::AsciiExt; - use std::fmt::{self, Debug, Display}; use proc_macro2::Ident; diff --git a/instant-xml-macros/src/ser.rs b/instant-xml-macros/src/ser.rs index 0516eb1..f09cf5f 100644 --- a/instant-xml-macros/src/ser.rs +++ b/instant-xml-macros/src/ser.rs @@ -5,7 +5,8 @@ use quote::quote; use syn::spanned::Spanned; use super::{discard_lifetimes, meta_items, ContainerMeta, FieldMeta, Mode, VariantMeta}; -use crate::{case::RenameRule, Namespace}; +use crate::case::RenameRule; +use crate::Namespace; pub fn to_xml(input: &syn::DeriveInput) -> proc_macro2::TokenStream { let meta = match ContainerMeta::from_derive(input) { diff --git a/instant-xml/benches/decode.rs b/instant-xml/benches/decode.rs index e35c0ae..1f1fd8b 100644 --- a/instant-xml/benches/decode.rs +++ b/instant-xml/benches/decode.rs @@ -1,7 +1,6 @@ use std::borrow::Cow; -use bencher::Bencher; -use bencher::{benchmark_group, benchmark_main}; +use bencher::{benchmark_group, benchmark_main, Bencher}; use instant_xml::{from_str, FromXml}; fn decode_short_ascii(bench: &mut Bencher) { diff --git a/instant-xml/src/impls.rs b/instant-xml/src/impls.rs index 7683a22..ad8b59e 100644 --- a/instant-xml/src/impls.rs +++ b/instant-xml/src/impls.rs @@ -1,9 +1,9 @@ +use std::any::type_name; use std::borrow::Cow; -use std::fmt; +use std::marker::PhantomData; use std::net::IpAddr; -use std::str; use std::str::FromStr; -use std::{any::type_name, marker::PhantomData}; +use std::{fmt, str}; #[cfg(feature = "chrono")] use chrono::{DateTime, NaiveDate, Utc}; diff --git a/instant-xml/src/lib.rs b/instant-xml/src/lib.rs index e31685a..b6519fb 100644 --- a/instant-xml/src/lib.rs +++ b/instant-xml/src/lib.rs @@ -1,8 +1,8 @@ -use std::{borrow::Cow, fmt}; - -use thiserror::Error; +use std::borrow::Cow; +use std::fmt; pub use macros::{FromXml, ToXml}; +use thiserror::Error; #[doc(hidden)] pub mod de; diff --git a/instant-xml/tests/attr-no-ns.rs b/instant-xml/tests/attr-no-ns.rs index 759318c..26ad74f 100644 --- a/instant-xml/tests/attr-no-ns.rs +++ b/instant-xml/tests/attr-no-ns.rs @@ -1,6 +1,5 @@ -use similar_asserts::assert_eq; - use instant_xml::{from_str, to_string, FromXml, ToXml}; +use similar_asserts::assert_eq; #[derive(Debug, Eq, FromXml, PartialEq, ToXml)] struct Basic { diff --git a/instant-xml/tests/chrono.rs b/instant-xml/tests/chrono.rs index c1081e1..210871e 100644 --- a/instant-xml/tests/chrono.rs +++ b/instant-xml/tests/chrono.rs @@ -1,9 +1,8 @@ #![cfg(feature = "chrono")] use chrono::{DateTime, TimeZone, Utc}; -use similar_asserts::assert_eq; - use instant_xml::{from_str, to_string, FromXml, ToXml}; +use similar_asserts::assert_eq; #[derive(Debug, Eq, PartialEq, FromXml, ToXml)] struct Test { diff --git a/instant-xml/tests/de-direct.rs b/instant-xml/tests/de-direct.rs index e3ec9f0..9c4c801 100644 --- a/instant-xml/tests/de-direct.rs +++ b/instant-xml/tests/de-direct.rs @@ -1,8 +1,7 @@ use std::borrow::Cow; -use similar_asserts::assert_eq; - use instant_xml::{from_str, Error, FromXml}; +use similar_asserts::assert_eq; #[derive(Debug, Eq, PartialEq, FromXml)] #[xml(ns("URI"))] diff --git a/instant-xml/tests/de-nested.rs b/instant-xml/tests/de-nested.rs index 196d148..37336d3 100644 --- a/instant-xml/tests/de-nested.rs +++ b/instant-xml/tests/de-nested.rs @@ -1,6 +1,5 @@ -use similar_asserts::assert_eq; - use instant_xml::{from_str, FromXml}; +use similar_asserts::assert_eq; #[derive(Debug, Eq, PartialEq, FromXml)] #[xml(ns("URI", bar = BAR))] diff --git a/instant-xml/tests/de-ns.rs b/instant-xml/tests/de-ns.rs index 7f11f4a..b9fe8a8 100644 --- a/instant-xml/tests/de-ns.rs +++ b/instant-xml/tests/de-ns.rs @@ -1,6 +1,5 @@ -use similar_asserts::assert_eq; - use instant_xml::{from_str, Error, FromXml}; +use similar_asserts::assert_eq; #[derive(Debug, Eq, PartialEq, FromXml)] struct NestedWrongNamespace { diff --git a/instant-xml/tests/direct.rs b/instant-xml/tests/direct.rs index 17e1f28..836b14a 100644 --- a/instant-xml/tests/direct.rs +++ b/instant-xml/tests/direct.rs @@ -1,6 +1,5 @@ -use similar_asserts::assert_eq; - use instant_xml::{from_str, to_string, FromXml, ToXml}; +use similar_asserts::assert_eq; #[derive(Clone, Debug, Eq, FromXml, PartialEq, ToXml)] struct Foo { diff --git a/instant-xml/tests/escaping.rs b/instant-xml/tests/escaping.rs index 4d3de50..55c9dab 100644 --- a/instant-xml/tests/escaping.rs +++ b/instant-xml/tests/escaping.rs @@ -1,8 +1,7 @@ use std::borrow::Cow; -use similar_asserts::assert_eq; - use instant_xml::{from_str, to_string, FromXml, ToXml}; +use similar_asserts::assert_eq; #[derive(Debug, PartialEq, Eq, FromXml, ToXml)] #[xml(ns("URI"))] diff --git a/instant-xml/tests/forward-enum.rs b/instant-xml/tests/forward-enum.rs index 5fb092a..a3d81e9 100644 --- a/instant-xml/tests/forward-enum.rs +++ b/instant-xml/tests/forward-enum.rs @@ -1,8 +1,7 @@ use std::borrow::Cow; -use similar_asserts::assert_eq; - use instant_xml::{from_str, to_string, FromXml, ToXml}; +use similar_asserts::assert_eq; #[derive(Debug, FromXml, PartialEq, ToXml)] #[xml(forward)] diff --git a/instant-xml/tests/generics.rs b/instant-xml/tests/generics.rs index 8e123d9..4064f67 100644 --- a/instant-xml/tests/generics.rs +++ b/instant-xml/tests/generics.rs @@ -1,6 +1,5 @@ -use similar_asserts::assert_eq; - use instant_xml::{from_str, to_string, FromXml, ToXml}; +use similar_asserts::assert_eq; #[derive(Debug, Eq, FromXml, ToXml, PartialEq)] struct Foo { diff --git a/instant-xml/tests/lifetime.rs b/instant-xml/tests/lifetime.rs index 3f0bf41..4800ca2 100644 --- a/instant-xml/tests/lifetime.rs +++ b/instant-xml/tests/lifetime.rs @@ -1,8 +1,7 @@ use std::borrow::Cow; -use similar_asserts::assert_eq; - use instant_xml::{from_str, to_string, FromXml, ToXml}; +use similar_asserts::assert_eq; #[derive(Debug, Eq, FromXml, PartialEq, ToXml)] struct Foo { diff --git a/instant-xml/tests/option.rs b/instant-xml/tests/option.rs index 5a597a2..f49c438 100644 --- a/instant-xml/tests/option.rs +++ b/instant-xml/tests/option.rs @@ -1,8 +1,7 @@ use std::borrow::Cow; -use similar_asserts::assert_eq; - use instant_xml::{from_str, to_string, FromXml, ToXml}; +use similar_asserts::assert_eq; #[derive(Debug, Eq, FromXml, PartialEq, ToXml)] struct Foo { diff --git a/instant-xml/tests/rename.rs b/instant-xml/tests/rename.rs index dd38774..2792014 100644 --- a/instant-xml/tests/rename.rs +++ b/instant-xml/tests/rename.rs @@ -1,6 +1,5 @@ -use similar_asserts::assert_eq; - use instant_xml::{from_str, to_string, FromXml, ToXml}; +use similar_asserts::assert_eq; #[derive(Debug, Eq, PartialEq, FromXml, ToXml)] #[xml(rename = "renamed")] diff --git a/instant-xml/tests/scalar-enum.rs b/instant-xml/tests/scalar-enum.rs index 9ffc10a..8e215ca 100644 --- a/instant-xml/tests/scalar-enum.rs +++ b/instant-xml/tests/scalar-enum.rs @@ -1,6 +1,5 @@ -use similar_asserts::assert_eq; - use instant_xml::{from_str, to_string, FromXml, ToXml}; +use similar_asserts::assert_eq; #[derive(Debug, Eq, FromXml, PartialEq, ToXml)] #[xml(scalar)] diff --git a/instant-xml/tests/scalar.rs b/instant-xml/tests/scalar.rs index 4f6acf0..2b7387c 100644 --- a/instant-xml/tests/scalar.rs +++ b/instant-xml/tests/scalar.rs @@ -1,8 +1,7 @@ use std::borrow::Cow; -use similar_asserts::assert_eq; - use instant_xml::{from_str, FromXml, ToXml}; +use similar_asserts::assert_eq; #[derive(Debug, PartialEq, Eq, FromXml, ToXml)] #[xml(ns("URI"))] diff --git a/instant-xml/tests/ser-attr-ns.rs b/instant-xml/tests/ser-attr-ns.rs index 603bb3f..b178972 100644 --- a/instant-xml/tests/ser-attr-ns.rs +++ b/instant-xml/tests/ser-attr-ns.rs @@ -1,6 +1,5 @@ -use similar_asserts::assert_eq; - use instant_xml::{to_string, ToXml}; +use similar_asserts::assert_eq; #[derive(ToXml)] #[xml(ns(bar = "BAR"))] diff --git a/instant-xml/tests/ser-child-ns.rs b/instant-xml/tests/ser-child-ns.rs index afcc97b..2b122bd 100644 --- a/instant-xml/tests/ser-child-ns.rs +++ b/instant-xml/tests/ser-child-ns.rs @@ -1,6 +1,5 @@ -use similar_asserts::assert_eq; - use instant_xml::{to_string, ToXml}; +use similar_asserts::assert_eq; #[derive(Debug, Eq, PartialEq, ToXml)] #[xml(ns(dar = "BAZ", internal = INTERNAL))] diff --git a/instant-xml/tests/ser-named.rs b/instant-xml/tests/ser-named.rs index cd25283..3ab090c 100644 --- a/instant-xml/tests/ser-named.rs +++ b/instant-xml/tests/ser-named.rs @@ -1,6 +1,5 @@ -use similar_asserts::assert_eq; - use instant_xml::{to_string, ToXml}; +use similar_asserts::assert_eq; #[derive(Debug, Eq, PartialEq, ToXml)] #[xml(ns(bar = "BAZ", foo = "BAR"))] diff --git a/instant-xml/tests/ser-nested.rs b/instant-xml/tests/ser-nested.rs index 2185dc2..bf291a7 100644 --- a/instant-xml/tests/ser-nested.rs +++ b/instant-xml/tests/ser-nested.rs @@ -1,6 +1,5 @@ -use similar_asserts::assert_eq; - use instant_xml::{to_string, ToXml}; +use similar_asserts::assert_eq; #[derive(Debug, Eq, PartialEq, ToXml)] #[xml(ns("URI", dar = "BAZ", internal = INTERNAL))] diff --git a/instant-xml/tests/ser-unit.rs b/instant-xml/tests/ser-unit.rs index 5ac8408..abdb53a 100644 --- a/instant-xml/tests/ser-unit.rs +++ b/instant-xml/tests/ser-unit.rs @@ -1,6 +1,5 @@ -use similar_asserts::assert_eq; - use instant_xml::{to_string, ToXml}; +use similar_asserts::assert_eq; #[derive(Debug, Eq, PartialEq, ToXml)] struct Unit; diff --git a/instant-xml/tests/transparent.rs b/instant-xml/tests/transparent.rs index 15aee7e..a364a29 100644 --- a/instant-xml/tests/transparent.rs +++ b/instant-xml/tests/transparent.rs @@ -1,8 +1,7 @@ use std::borrow::Cow; -use similar_asserts::assert_eq; - use instant_xml::{from_str, to_string, Error, FromXml, ToXml}; +use similar_asserts::assert_eq; #[derive(Debug, Eq, FromXml, PartialEq, ToXml)] struct Wrapper { diff --git a/instant-xml/tests/unnamed.rs b/instant-xml/tests/unnamed.rs index 6e3782e..8bc2444 100644 --- a/instant-xml/tests/unnamed.rs +++ b/instant-xml/tests/unnamed.rs @@ -1,6 +1,5 @@ -use similar_asserts::assert_eq; - use instant_xml::{from_str, to_string, FromXml, ToXml}; +use similar_asserts::assert_eq; #[derive(Debug, Eq, FromXml, PartialEq, ToXml)] struct OneNumber(i32); diff --git a/instant-xml/tests/vec.rs b/instant-xml/tests/vec.rs index d097aa3..efd0070 100644 --- a/instant-xml/tests/vec.rs +++ b/instant-xml/tests/vec.rs @@ -1,6 +1,5 @@ -use similar_asserts::assert_eq; - use instant_xml::{from_str, to_string, FromXml, ToXml}; +use similar_asserts::assert_eq; #[derive(Debug, Eq, FromXml, PartialEq, ToXml)] struct Foo { diff --git a/instant-xml/tests/with.rs b/instant-xml/tests/with.rs index f9efbf8..605a73f 100644 --- a/instant-xml/tests/with.rs +++ b/instant-xml/tests/with.rs @@ -1,8 +1,7 @@ use std::fmt; -use similar_asserts::assert_eq; - use instant_xml::{to_string, Error, Serializer, ToXml}; +use similar_asserts::assert_eq; #[derive(ToXml)] struct Foo { diff --git a/rustfmt.toml b/rustfmt.toml new file mode 100644 index 0000000..4e14834 --- /dev/null +++ b/rustfmt.toml @@ -0,0 +1,3 @@ +# Imports +group_imports = "StdExternalCrate" +imports_granularity = "Module"