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

diff --git a/components/net/resource_task.rs b/components/net/resource_task.rs
index d0fea0ac6c1..4337bf1cc31 100644
--- a/components/net/resource_task.rs
+++ b/components/net/resource_task.rs
@@ -11,18 +11,18 @@ use data_loader;
 use devtools_traits::{DevtoolsControlMsg};
 use file_loader;
 use hsts::{HSTSList, preload_hsts_domains};
-use http_loader::{self, create_http_connector, Connector};
+use http_loader::{self, Connector, create_http_connector};
 use hyper::client::pool::Pool;
 use hyper::header::{ContentType, Header, SetCookie};
-use hyper::mime::{Mime, TopLevel, SubLevel};
+use hyper::mime::{Mime, SubLevel, TopLevel};
 use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
 use mime_classifier::{ApacheBugFlag, MIMEClassifier, NoSniffFlag};
 use net_traits::ProgressMsg::Done;
-use net_traits::{ControlMsg, LoadData, LoadResponse, LoadConsumer, CookieSource};
-use net_traits::{Metadata, ProgressMsg, ResourceTask, AsyncResponseTarget, ResponseAction};
+use net_traits::{AsyncResponseTarget, Metadata, ProgressMsg, ResourceTask, ResponseAction};
+use net_traits::{ControlMsg, CookieSource, LoadConsumer, LoadData, LoadResponse};
 use std::borrow::ToOwned;
 use std::boxed::FnBox;
-use std::sync::mpsc::{channel, Sender};
+use std::sync::mpsc::{Sender, channel};
 use std::sync::{Arc, RwLock};
 use url::Url;
 use util::opts;