Ungroup imports

test_suite/tests/test_annotations.rs

@@ -13,16 +13,14 @@
 use serde::de::{self, Deserialize, Deserializer, IgnoredAny, MapAccess, Unexpected, Visitor};
 use serde::ser::{Serialize, Serializer};
 use serde_derive::{Deserialize, Serialize};
-
-use std::collections::{BTreeMap, HashMap};
-use std::convert::TryFrom;
-use std::fmt;
-use std::marker::PhantomData;
-
 use serde_test::{
     assert_de_tokens, assert_de_tokens_error, assert_ser_tokens, assert_ser_tokens_error,
     assert_tokens, Token,
 };
+use std::collections::{BTreeMap, HashMap};
+use std::convert::TryFrom;
+use std::fmt;
+use std::marker::PhantomData;
 
 trait MyDefault: Sized {
     fn my_default() -> Self;

test_suite/tests/test_borrow.rs

@@ -8,7 +8,6 @@ use serde::de::value::{BorrowedStrDeserializer, MapDeserializer};
 use serde::de::{Deserialize, Deserializer, IntoDeserializer};
 use serde_derive::Deserialize;
 use serde_test::{assert_de_tokens, assert_de_tokens_error, Token};
-
 use std::borrow::Cow;
 
 #[test]

test_suite/tests/test_de.rs

@@ -10,6 +10,10 @@
 )]
 #![cfg_attr(feature = "unstable", feature(never_type))]
 
+use fnv::FnvHasher;
+use serde::de::{Deserialize, DeserializeOwned, Deserializer, IntoDeserializer};
+use serde_derive::Deserialize;
+use serde_test::{assert_de_tokens, Configure, Token};
 use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
 use std::default::Default;
 use std::ffi::{CStr, CString, OsString};
@@ -27,16 +31,10 @@ use std::sync::atomic::{
     AtomicBool, AtomicI16, AtomicI32, AtomicI8, AtomicIsize, AtomicU16, AtomicU32, AtomicU8,
     AtomicUsize, Ordering,
 };
-use std::sync::{Arc, Weak as ArcWeak};
-use std::time::{Duration, UNIX_EPOCH};
-
 #[cfg(target_arch = "x86_64")]
 use std::sync::atomic::{AtomicI64, AtomicU64};
-
-use fnv::FnvHasher;
-use serde::de::{Deserialize, DeserializeOwned, Deserializer, IntoDeserializer};
-use serde_derive::Deserialize;
-use serde_test::{assert_de_tokens, Configure, Token};
+use std::sync::{Arc, Weak as ArcWeak};
+use std::time::{Duration, UNIX_EPOCH};
 
 #[macro_use]
 mod macros;

test_suite/tests/test_gen.rs

@@ -23,7 +23,6 @@
 use serde::de::{Deserialize, DeserializeOwned, Deserializer};
 use serde::ser::{Serialize, Serializer};
 use serde_derive::{Deserialize, Serialize};
-
 use std::borrow::Cow;
 use std::marker::PhantomData;
 use std::option::Option as StdOption;

test_suite/tests/test_macros.rs

@@ -12,7 +12,6 @@ use serde_derive::{Deserialize, Serialize};
 use serde_test::{
     assert_de_tokens, assert_de_tokens_error, assert_ser_tokens, assert_tokens, Token,
 };
-
 use std::collections::BTreeMap;
 use std::marker::PhantomData;
 

test_suite/tests/test_roundtrip.rs

@@ -1,5 +1,4 @@
 use serde_test::{assert_tokens, Configure, Token};
-
 use std::net;
 
 #[macro_use]

test_suite/tests/test_ser.rs

@@ -1,6 +1,9 @@
 #![allow(clippy::derive_partial_eq_without_eq, clippy::unreadable_literal)]
 #![cfg_attr(feature = "unstable", feature(never_type))]
 
+use fnv::FnvHasher;
+use serde_derive::Serialize;
+use serde_test::{assert_ser_tokens, assert_ser_tokens_error, Configure, Token};
 use std::cell::RefCell;
 use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
 use std::ffi::CString;
@@ -9,21 +12,16 @@ use std::num::Wrapping;
 use std::ops::Bound;
 use std::path::{Path, PathBuf};
 use std::rc::{Rc, Weak as RcWeak};
+#[cfg(unix)]
+use std::str;
 use std::sync::atomic::{
     AtomicBool, AtomicI16, AtomicI32, AtomicI8, AtomicIsize, AtomicU16, AtomicU32, AtomicU8,
     AtomicUsize,
 };
-use std::sync::{Arc, Mutex, RwLock, Weak as ArcWeak};
-use std::time::{Duration, UNIX_EPOCH};
-
-#[cfg(unix)]
-use std::str;
 #[cfg(target_arch = "x86_64")]
 use std::sync::atomic::{AtomicI64, AtomicU64};
-
-use fnv::FnvHasher;
-use serde_derive::Serialize;
-use serde_test::{assert_ser_tokens, assert_ser_tokens_error, Configure, Token};
+use std::sync::{Arc, Mutex, RwLock, Weak as ArcWeak};
+use std::time::{Duration, UNIX_EPOCH};
 
 #[macro_use]
 mod macros;

test_suite/tests/ui/conflict/flatten-newtype-struct.rs

@@ -1,5 +1,4 @@
 use serde_derive::Serialize;
-
 use std::collections::HashMap;
 
 #[derive(Serialize)]

test_suite/tests/ui/conflict/flatten-newtype-struct.stderr

@@ -1,5 +1,5 @@
 error: #[serde(flatten)] cannot be used on newtype structs
- --> tests/ui/conflict/flatten-newtype-struct.rs:6:12
+ --> tests/ui/conflict/flatten-newtype-struct.rs:5:12
   |
-6 | struct Foo(#[serde(flatten)] HashMap<String, String>);
+5 | struct Foo(#[serde(flatten)] HashMap<String, String>);
   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

test_suite/tests/ui/conflict/flatten-tuple-struct.rs

@@ -1,5 +1,4 @@
 use serde_derive::Serialize;
-
 use std::collections::HashMap;
 
 #[derive(Serialize)]

test_suite/tests/ui/conflict/flatten-tuple-struct.stderr

@@ -1,5 +1,5 @@
 error: #[serde(flatten)] cannot be used on tuple structs
- --> tests/ui/conflict/flatten-tuple-struct.rs:6:17
+ --> tests/ui/conflict/flatten-tuple-struct.rs:5:17
   |
-6 | struct Foo(u32, #[serde(flatten)] HashMap<String, String>);
+5 | struct Foo(u32, #[serde(flatten)] HashMap<String, String>);
   |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^