From 5b03581442febc7a2aa57a7227e0051915706c7c Mon Sep 17 00:00:00 2001
From: Dan Gohman <sunfish@mozilla.com>
Date: Thu, 6 Dec 2018 17:59:58 -0500
Subject: [PATCH] Tidy up `use` declaration syntax.

---
 lib/entity/src/map.rs           | 4 +++-
 lib/entity/src/primary.rs       | 4 +++-
 lib/entity/src/set.rs           | 3 ++-
 lib/entity/src/sparse.rs        | 3 ++-
 lib/filetests/src/concurrent.rs | 3 ++-
 lib/filetests/src/runner.rs     | 3 ++-
 lib/module/src/data_context.rs  | 2 +-
 7 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/lib/entity/src/map.rs b/lib/entity/src/map.rs
index df8ac115a2..dbec7b2f11 100644
--- a/lib/entity/src/map.rs
+++ b/lib/entity/src/map.rs
@@ -1,10 +1,12 @@
 //! Densely numbered entity references as mapping keys.
 
+use iter::{Iter, IterMut};
+use keys::Keys;
 use std::marker::PhantomData;
 use std::ops::{Index, IndexMut};
 use std::slice;
 use std::vec::Vec;
-use {EntityRef, Iter, IterMut, Keys};
+use EntityRef;
 
 /// A mapping `K -> V` for densely indexed entity references.
 ///
diff --git a/lib/entity/src/primary.rs b/lib/entity/src/primary.rs
index 6fe70523fe..813fdeca7f 100644
--- a/lib/entity/src/primary.rs
+++ b/lib/entity/src/primary.rs
@@ -1,10 +1,12 @@
 //! Densely numbered entity references as mapping keys.
+use iter::{Iter, IterMut};
+use keys::Keys;
 use std::iter::FromIterator;
 use std::marker::PhantomData;
 use std::ops::{Index, IndexMut};
 use std::slice;
 use std::vec::Vec;
-use {EntityRef, Iter, IterMut, Keys};
+use EntityRef;
 
 /// A primary mapping `K -> V` allocating dense entity references.
 ///
diff --git a/lib/entity/src/set.rs b/lib/entity/src/set.rs
index 4f7b631c93..58f1a7da0a 100644
--- a/lib/entity/src/set.rs
+++ b/lib/entity/src/set.rs
@@ -1,8 +1,9 @@
 //! Densely numbered entity references as set keys.
 
+use keys::Keys;
 use std::marker::PhantomData;
 use std::vec::Vec;
-use {EntityRef, Keys};
+use EntityRef;
 
 /// A set of `K` for densely indexed entity references.
 ///
diff --git a/lib/entity/src/sparse.rs b/lib/entity/src/sparse.rs
index 1a6de3e39d..b1af505304 100644
--- a/lib/entity/src/sparse.rs
+++ b/lib/entity/src/sparse.rs
@@ -7,11 +7,12 @@
 //! > Briggs, Torczon, *An efficient representation for sparse sets*,
 //!   ACM Letters on Programming Languages and Systems, Volume 2, Issue 1-4, March-Dec. 1993.
 
+use map::SecondaryMap;
 use std::mem;
 use std::slice;
 use std::u32;
 use std::vec::Vec;
-use {EntityRef, SecondaryMap};
+use EntityRef;
 
 /// Trait for extracting keys from values stored in a `SparseMap`.
 ///
diff --git a/lib/filetests/src/concurrent.rs b/lib/filetests/src/concurrent.rs
index df9034618b..ae04a3b6c5 100644
--- a/lib/filetests/src/concurrent.rs
+++ b/lib/filetests/src/concurrent.rs
@@ -7,13 +7,14 @@ use cranelift_codegen::dbg::LOG_FILENAME_PREFIX;
 use cranelift_codegen::timing;
 use file_per_thread_logger;
 use num_cpus;
+use runone;
 use std::panic::catch_unwind;
 use std::path::{Path, PathBuf};
 use std::sync::mpsc::{channel, Receiver, Sender};
 use std::sync::{Arc, Mutex};
 use std::thread;
 use std::time::Duration;
-use {runone, TestResult};
+use TestResult;
 
 /// Request sent to worker threads contains jobid and path.
 struct Request(usize, PathBuf);
diff --git a/lib/filetests/src/runner.rs b/lib/filetests/src/runner.rs
index 778150fa7c..37224c2dd3 100644
--- a/lib/filetests/src/runner.rs
+++ b/lib/filetests/src/runner.rs
@@ -5,12 +5,13 @@
 
 use concurrent::{ConcurrentRunner, Reply};
 use cranelift_codegen::timing;
+use runone;
 use std::error::Error;
 use std::ffi::OsStr;
 use std::fmt::{self, Display};
 use std::path::{Path, PathBuf};
 use std::time;
-use {runone, TestResult};
+use TestResult;
 
 /// Timeout in seconds when we're not making progress.
 const TIMEOUT_PANIC: usize = 10;
diff --git a/lib/module/src/data_context.rs b/lib/module/src/data_context.rs
index 4a7fdd7a6e..d941e9c411 100644
--- a/lib/module/src/data_context.rs
+++ b/lib/module/src/data_context.rs
@@ -132,8 +132,8 @@ impl DataContext {
 
 #[cfg(test)]
 mod tests {
+    use super::{DataContext, Init};
     use cranelift_codegen::ir;
-    use {DataContext, Init};
 
     #[test]
     fn basic_data_context() {