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, 7 insertions, 8 deletions

diff --git a/components/script/cors.rs b/components/script/cors.rs
index 4de0a5ad396..89ef23f1d92 100644
--- a/components/script/cors.rs
+++ b/components/script/cors.rs
@@ -10,23 +10,22 @@
 //! with CORSRequest being expanded into FetchRequest (etc)
 
 use hyper::client::Request;
-use hyper::header::{AccessControlMaxAge, AccessControlAllowOrigin};
-use hyper::header::{AccessControlRequestHeaders, AccessControlAllowHeaders};
-use hyper::header::{AccessControlRequestMethod, AccessControlAllowMethods};
+use hyper::header::{AccessControlAllowHeaders, AccessControlRequestHeaders};
+use hyper::header::{AccessControlAllowMethods, AccessControlRequestMethod};
+use hyper::header::{AccessControlAllowOrigin, AccessControlMaxAge};
 use hyper::header::{ContentType, Host};
-use hyper::header::{Headers, HeaderView};
+use hyper::header::{HeaderView, Headers};
 use hyper::method::Method;
-use hyper::mime::{Mime, TopLevel, SubLevel};
+use hyper::mime::{Mime, SubLevel, TopLevel};
 use hyper::status::StatusClass::Success;
-use net_traits::{AsyncResponseListener, ResponseAction, Metadata};
+use net_traits::{AsyncResponseListener, Metadata, ResponseAction};
 use network_listener::{NetworkListener, PreInvoke};
 use script_task::ScriptChan;
 use std::ascii::AsciiExt;
 use std::borrow::ToOwned;
 use std::cell::RefCell;
 use std::sync::{Arc, Mutex};
-use time;
-use time::{now, Timespec};
+use time::{self, Timespec, now};
 use unicase::UniCase;
 use url::{SchemeData, Url};
 use util::mem::HeapSizeOf;