Merge pull request #55 from palfrey/import-format

Fix formatting of imports

.github/workflows/ci.yml

@@ -39,7 +39,7 @@ jobs:
         with:
           command: fmt
           args: -- --check
-        if: ${{ matrix.features == 'default' }}
+        if: ${{ matrix.features == 'default' && matrix.rust == 'nightly' }}
       - name: Clippy
         uses: actions-rs/cargo@v1.0.3
         env:

rustfmt.toml

@@ -0,0 +1,2 @@
+imports_granularity = "Crate"
+newline_style = "Unix"

serial_test/src/code_lock.rs

@@ -1,11 +1,12 @@
 use lazy_static::lazy_static;
 use parking_lot::{Mutex, ReentrantMutex, ReentrantMutexGuard, RwLock};
-use std::cell::RefCell;
-use std::collections::HashMap;
-use std::ops::{Deref, DerefMut};
-use std::sync::atomic::AtomicU32;
-use std::sync::Arc;
-use std::time::Duration;
+use std::{
+    cell::RefCell,
+    collections::HashMap,
+    ops::{Deref, DerefMut},
+    sync::{atomic::AtomicU32, Arc},
+    time::Duration,
+};
 
 struct UniqueReentrantMutex {
     mutex: ReentrantMutex<()>,
@@ -122,8 +123,8 @@ mod tests {
     use super::{check_new_key, wait_duration, LOCKS};
     use itertools::Itertools;
     use parking_lot::RwLock;
-    use std::ops::Deref;
     use std::{
+        ops::Deref,
         sync::{Arc, Barrier},
         thread,
     };

serial_test_test/src/lib.rs

@@ -37,14 +37,16 @@
 //! ```
 
 use lazy_static::lazy_static;
-use std::convert::TryInto;
-use std::env;
-use std::fs;
-use std::sync::atomic::AtomicUsize;
-use std::sync::atomic::Ordering;
-use std::sync::Arc;
-use std::thread;
-use std::time::Duration;
+use std::{
+    convert::TryInto,
+    env, fs,
+    sync::{
+        atomic::{AtomicUsize, Ordering},
+        Arc,
+    },
+    thread,
+    time::Duration,
+};
 
 lazy_static! {
     static ref LOCK: Arc<AtomicUsize> = Arc::new(AtomicUsize::new(0));