Auto merge of #7698 - Wafflespeanut:sorting, r=frewsxcv

sorted the declarations in various files...

This is a direct extract from my abandoned PR for a lint (#7546), along with some rather clumsy modifications (only on `components/script/dom/mod.rs` and `components/style/lib.rs`), because I had to sort some of the files again to make peace with tidy, which hasn't been educated about sorting yet!

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7698)
<!-- Reviewable:end -->

1 files changed, 2 insertions, 3 deletions

diff --git a/components/script/dom/eventtarget.rs b/components/script/dom/eventtarget.rs
index 145ff83abbf..0a7f8a151de 100644
--- a/components/script/dom/eventtarget.rs
+++ b/components/script/dom/eventtarget.rs
@@ -19,8 +19,8 @@ use dom::workerglobalscope::WorkerGlobalScopeTypeId;
 use dom::xmlhttprequesteventtarget::XMLHttpRequestEventTargetTypeId;
 use fnv::FnvHasher;
 use js::jsapi::{CompileFunction, JS_GetFunctionObject};
+use js::jsapi::{HandleObject, JSContext, RootedFunction};
 use js::jsapi::{JSAutoCompartment, JSAutoRequest};
-use js::jsapi::{JSContext, RootedFunction, HandleObject};
 use js::rust::{AutoObjectVectorWrapper, CompileOptionsWrapper};
 use libc::{c_char, size_t};
 use std::borrow::ToOwned;
@@ -29,9 +29,8 @@ use std::collections::hash_map::Entry::{Occupied, Vacant};
 use std::collections::hash_state::DefaultState;
 use std::default::Default;
 use std::ffi::CString;
-use std::intrinsics;
-use std::ptr;
 use std::rc::Rc;
+use std::{intrinsics, ptr};
 use url::Url;
 use util::mem::HeapSizeOf;
 use util::str::DOMString;