Fix reported test-tidy errors for unmerged import blocks

This merges import blocks that were reported by tidy as unmerged.

12 files changed, 19 insertions, 39 deletions

diff --git a/components/script/dom/bindings/callback.rs b/components/script/dom/bindings/callback.rs
index e5a887a88b0..4a54db01875 100644
--- a/components/script/dom/bindings/callback.rs
+++ b/components/script/dom/bindings/callback.rs
@@ -16,7 +16,6 @@ use js::jsapi::{JS_GetProperty, JS_IsExceptionPending, JS_ReportPendingException
 use js::jsapi::{JS_SaveFrameChain, JS_RestoreFrameChain};
 use js::jsapi::{RootedObject, RootedValue, MutableHandleObject, Heap};
 use js::jsval::{JSVal, UndefinedValue};
-
 use std::default::Default;
 use std::ffi::CString;
 use std::intrinsics::return_address;
diff --git a/components/script/dom/bindings/cell.rs b/components/script/dom/bindings/cell.rs
index e2cbe4bfef5..18fffa56b33 100644
--- a/components/script/dom/bindings/cell.rs
+++ b/components/script/dom/bindings/cell.rs
@@ -6,12 +6,10 @@
 
 use dom::bindings::trace::JSTraceable;
 use js::jsapi::{JSTracer};
-
+use std::cell::{BorrowState, RefCell, Ref, RefMut};
 use util::task_state;
 use util::task_state::SCRIPT;
 
-use std::cell::{BorrowState, RefCell, Ref, RefMut};
-
 /// A mutable field in the DOM.
 ///
 /// This extends the API of `core::cell::RefCell` to allow unsafe access in
diff --git a/components/script/dom/bindings/conversions.rs b/components/script/dom/bindings/conversions.rs
index 7118bef0e68..2922e2250ae 100644
--- a/components/script/dom/bindings/conversions.rs
+++ b/components/script/dom/bindings/conversions.rs
@@ -32,14 +32,13 @@
 //! | sequences               | `Vec<T>`                         |
 //! | union types             | `T`                              |
 
+use core::nonzero::NonZero;
 use dom::bindings::codegen::PrototypeList;
 use dom::bindings::error::throw_type_error;
 use dom::bindings::js::Root;
 use dom::bindings::num::Finite;
 use dom::bindings::str::{ByteString, USVString};
 use dom::bindings::utils::{Reflectable, Reflector, DOMClass};
-use util::str::DOMString;
-
 use js;
 use js::glue::{GetProxyPrivate, IsWrapper, RUST_JS_NumberValue};
 use js::glue::{RUST_JSID_IS_STRING, RUST_JSID_TO_STRING, UnwrapObject};
@@ -54,8 +53,6 @@ use js::jsval::{UndefinedValue, NullValue, BooleanValue, Int32Value, UInt32Value
 use js::rust::{ToUint16, ToNumber, ToBoolean, ToString};
 use js::rust::{ToUint32, ToInt32};
 use js::rust::{ToUint64, ToInt64};
-
-use core::nonzero::NonZero;
 use libc;
 use num::Float;
 use num::traits::{Bounded, Zero};
@@ -64,6 +61,7 @@ use std::char;
 use std::ptr;
 use std::rc::Rc;
 use std::slice;
+use util::str::DOMString;
 
 trait As<O>: Copy {
     fn cast(self) -> O;
diff --git a/components/script/dom/bindings/error.rs b/components/script/dom/bindings/error.rs
index a5fb6d90e51..6fb338fd31d 100644
--- a/components/script/dom/bindings/error.rs
+++ b/components/script/dom/bindings/error.rs
@@ -8,21 +8,18 @@ use dom::bindings::codegen::PrototypeList::proto_id_to_name;
 use dom::bindings::conversions::ToJSValConvertible;
 use dom::bindings::global::GlobalRef;
 use dom::domexception::{DOMException, DOMErrorName};
-
-use util::mem::HeapSizeOf;
-use util::str::DOMString;
-
 use js::jsapi::JSAutoCompartment;
 use js::jsapi::{JSContext, JSObject, RootedValue};
 use js::jsapi::{JS_IsExceptionPending, JS_SetPendingException, JS_ReportPendingException};
 use js::jsapi::{JS_ReportErrorNumber1, JSErrorFormatString, JSExnType};
 use js::jsapi::{JS_SaveFrameChain, JS_RestoreFrameChain};
 use js::jsval::UndefinedValue;
-
 use libc;
 use std::ffi::CString;
 use std::mem;
 use std::ptr;
+use util::mem::HeapSizeOf;
+use util::str::DOMString;
 
 /// DOM exceptions that can be thrown by a native DOM method.
 #[derive(Debug, Clone, HeapSizeOf)]
diff --git a/components/script/dom/bindings/global.rs b/components/script/dom/bindings/global.rs
index 3ff081521cc..a2602a2ed2e 100644
--- a/components/script/dom/bindings/global.rs
+++ b/components/script/dom/bindings/global.rs
@@ -14,18 +14,15 @@ use dom::bindings::js::{JS, Root};
 use dom::bindings::utils::{Reflectable, Reflector};
 use dom::window::{self, ScriptHelpers};
 use dom::workerglobalscope::WorkerGlobalScope;
-use script_task::{ScriptChan, ScriptPort, CommonScriptMsg, ScriptTask};
-
-use msg::constellation_msg::{ConstellationChan, PipelineId, WorkerId};
-use net_traits::ResourceTask;
-use profile_traits::mem;
-
 use ipc_channel::ipc::IpcSender;
 use js::jsapi::{GetGlobalForObjectCrossCompartment};
 use js::jsapi::{JSContext, JSObject, JS_GetClass, MutableHandleValue};
 use js::{JSCLASS_IS_GLOBAL, JSCLASS_IS_DOMJSCLASS};
+use msg::constellation_msg::{ConstellationChan, PipelineId, WorkerId};
+use net_traits::ResourceTask;
+use profile_traits::mem;
+use script_task::{ScriptChan, ScriptPort, CommonScriptMsg, ScriptTask};
 use url::Url;
-
 use util::mem::HeapSizeOf;
 
 /// A freely-copyable reference to a rooted global object.
diff --git a/components/script/dom/bindings/js.rs b/components/script/dom/bindings/js.rs
index e50bf68e478..065604d6976 100644
--- a/components/script/dom/bindings/js.rs
+++ b/components/script/dom/bindings/js.rs
@@ -23,6 +23,7 @@
 //! originating `Root<T>`.
 //!
 
+use core::nonzero::NonZero;
 use dom::bindings::trace::JSTraceable;
 use dom::bindings::trace::trace_reflector;
 use dom::bindings::utils::{Reflector, Reflectable};
@@ -31,12 +32,10 @@ use js::jsapi::{JSObject, Heap, JSTracer};
 use js::jsval::JSVal;
 use layout_interface::TrustedNodeAddress;
 use script_task::STACK_ROOTS;
-use util::mem::HeapSizeOf;
-
-use core::nonzero::NonZero;
 use std::cell::{Cell, UnsafeCell};
 use std::default::Default;
 use std::ops::Deref;
+use util::mem::HeapSizeOf;
 
 /// A traced reference to a DOM object. Must only be used as a field in other
 /// DOM objects.
diff --git a/components/script/dom/bindings/proxyhandler.rs b/components/script/dom/bindings/proxyhandler.rs
index 66240df0d2c..8ad7a819206 100644
--- a/components/script/dom/bindings/proxyhandler.rs
+++ b/components/script/dom/bindings/proxyhandler.rs
@@ -20,7 +20,6 @@ use js::jsapi::{JS_StrictPropertyStub, JSErrNum};
 use js::jsval::ObjectValue;
 use js::{JSPROP_GETTER, JSPROP_ENUMERATE, JSPROP_READONLY};
 use js::{JSTrue, JSFalse};
-
 use libc;
 use std::mem;
 use std::ptr;
diff --git a/components/script/dom/bindings/refcounted.rs b/components/script/dom/bindings/refcounted.rs
index a1adf059dba..755f8ec6076 100644
--- a/components/script/dom/bindings/refcounted.rs
+++ b/components/script/dom/bindings/refcounted.rs
@@ -22,15 +22,13 @@
 //! is rooted when a hashmap entry is first created, and unrooted when the hashmap entry
 //! is removed.
 
+use core::nonzero::NonZero;
 use dom::bindings::js::Root;
 use dom::bindings::trace::trace_reflector;
 use dom::bindings::utils::{Reflector, Reflectable};
-use script_task::{ScriptChan, CommonScriptMsg};
-
 use js::jsapi::{JSContext, JSTracer};
-
-use core::nonzero::NonZero;
 use libc;
+use script_task::{ScriptChan, CommonScriptMsg};
 use std::cell::RefCell;
 use std::collections::hash_map::Entry::{Vacant, Occupied};
 use std::collections::hash_map::HashMap;
diff --git a/components/script/dom/bindings/str.rs b/components/script/dom/bindings/str.rs
index ee6514bffbd..dd4295f2c0b 100644
--- a/components/script/dom/bindings/str.rs
+++ b/components/script/dom/bindings/str.rs
@@ -10,7 +10,6 @@ use std::hash::{Hash, Hasher};
 use std::ops;
 use std::str;
 use std::str::FromStr;
-
 use util::mem::HeapSizeOf;
 
 /// Encapsulates the IDL `ByteString` type.
diff --git a/components/script/dom/bindings/structuredclone.rs b/components/script/dom/bindings/structuredclone.rs
index 60dc10d0ced..90a0ca25df6 100644
--- a/components/script/dom/bindings/structuredclone.rs
+++ b/components/script/dom/bindings/structuredclone.rs
@@ -8,13 +8,11 @@
 use dom::bindings::error::Error::DataClone;
 use dom::bindings::error::Fallible;
 use dom::bindings::global::GlobalRef;
-
 use js::glue::JS_STRUCTURED_CLONE_VERSION;
 use js::jsapi::JSContext;
 use js::jsapi::JS_ReadStructuredClone;
 use js::jsapi::{HandleValue, MutableHandleValue};
 use js::jsapi::{JS_WriteStructuredClone, JS_ClearPendingException};
-
 use libc::size_t;
 use std::ptr;
 
diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs
index 5a9aa5b2abb..de9d788c849 100644
--- a/components/script/dom/bindings/trace.rs
+++ b/components/script/dom/bindings/trace.rs
@@ -29,15 +29,13 @@
 //! The `no_jsmanaged_fields!()` macro adds an empty implementation of `JSTraceable` to
 //! a datatype.
 
-use dom::bindings::js::{JS, Root};
-use dom::bindings::refcounted::Trusted;
-use dom::bindings::utils::{Reflectable, Reflector, WindowProxyHandler};
-use script_task::ScriptChan;
-
 use canvas_traits::WebGLError;
 use canvas_traits::{CanvasGradientStop, LinearGradientStyle, RadialGradientStyle};
 use canvas_traits::{LineCapStyle, LineJoinStyle, CompositionOrBlending, RepetitionStyle};
 use cssparser::RGBA;
+use dom::bindings::js::{JS, Root};
+use dom::bindings::refcounted::Trusted;
+use dom::bindings::utils::{Reflectable, Reflector, WindowProxyHandler};
 use encoding::types::EncodingRef;
 use euclid::matrix2d::Matrix2D;
 use euclid::rect::Rect;
@@ -59,6 +57,7 @@ use net_traits::image_cache_task::{ImageCacheChan, ImageCacheTask};
 use net_traits::storage_task::StorageType;
 use profile_traits::mem::ProfilerChan as MemProfilerChan;
 use profile_traits::time::ProfilerChan as TimeProfilerChan;
+use script_task::ScriptChan;
 use script_traits::UntrustedNodeAddress;
 use selectors::parser::PseudoElement;
 use serde::{Serialize, Deserialize};
diff --git a/components/script/dom/bindings/utils.rs b/components/script/dom/bindings/utils.rs
index be600d807d3..6d61b6013b1 100644
--- a/components/script/dom/bindings/utils.rs
+++ b/components/script/dom/bindings/utils.rs
@@ -17,9 +17,6 @@ use dom::bindings::trace::trace_object;
 use dom::browsercontext;
 use dom::eventtarget::EventTargetTypeId;
 use dom::window;
-use util::mem::HeapSizeOf;
-use util::str::DOMString;
-
 use js;
 use js::glue::{CallJitMethodOp, CallJitGetterOp, CallJitSetterOp, IsWrapper};
 use js::glue::{RUST_FUNCTION_VALUE_TO_JITINFO, RUST_JSID_IS_INT};
@@ -61,6 +58,8 @@ use std::default::Default;
 use std::ffi::CString;
 use std::ptr;
 use string_cache::{Atom, Namespace};
+use util::mem::HeapSizeOf;
+use util::str::DOMString;
 
 /// Proxy handler for a WindowProxy.
 #[allow(raw_pointer_derive)]