sorted the extern crate, mod & use declarations

components/net/about_loader.rs

@@ -5,10 +5,10 @@
 use file_loader;
 use hyper::header::ContentType;
 use hyper::http::RawStatus;
-use hyper::mime::{Mime, TopLevel, SubLevel};
+use hyper::mime::{Mime, SubLevel, TopLevel};
 use mime_classifier::MIMEClassifier;
 use net_traits::ProgressMsg::Done;
-use net_traits::{LoadData, Metadata, LoadConsumer};
+use net_traits::{LoadConsumer, LoadData, Metadata};
 use resource_task::start_sending;
 use std::fs::PathExt;
 use std::sync::Arc;

components/net/data_loader.rs

@@ -4,8 +4,8 @@
 
 use hyper::mime::Mime;
 use mime_classifier::MIMEClassifier;
-use net_traits::ProgressMsg::{Payload, Done};
-use net_traits::{LoadData, Metadata, LoadConsumer};
+use net_traits::ProgressMsg::{Done, Payload};
+use net_traits::{LoadConsumer, LoadData, Metadata};
 use resource_task::start_sending;
 use rustc_serialize::base64::FromBase64;
 use std::sync::Arc;

components/net/fetch/request.rs

@@ -4,12 +4,12 @@
 
 use fetch::cors_cache::{CORSCache, CacheRequestDetails};
 use fetch::response::{Response, ResponseType};
-use hyper::header::{Accept, IfUnmodifiedSince, IfMatch, IfRange, Location};
-use hyper::header::{Header, Headers, ContentType, IfModifiedSince, IfNoneMatch};
-use hyper::header::{HeaderView, AcceptLanguage, ContentLanguage};
-use hyper::header::{QualityItem, qitem, q};
+use hyper::header::{Accept, IfMatch, IfRange, IfUnmodifiedSince, Location};
+use hyper::header::{AcceptLanguage, ContentLanguage, HeaderView};
+use hyper::header::{ContentType, Header, Headers, IfModifiedSince, IfNoneMatch};
+use hyper::header::{QualityItem, q, qitem};
 use hyper::method::Method;
-use hyper::mime::{Mime, TopLevel, SubLevel, Attr, Value};
+use hyper::mime::{Attr, Mime, SubLevel, TopLevel, Value};
 use hyper::status::StatusCode;
 use std::ascii::AsciiExt;
 use std::str::FromStr;

components/net/file_loader.rs

@@ -3,9 +3,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use mime_classifier::MIMEClassifier;
-use net_traits::ProgressMsg::{Payload, Done};
-use net_traits::{LoadData, Metadata, LoadConsumer};
-use resource_task::{start_sending, start_sending_sniffed, ProgressSender};
+use net_traits::ProgressMsg::{Done, Payload};
+use net_traits::{LoadConsumer, LoadData, Metadata};
+use resource_task::{ProgressSender, start_sending, start_sending_sniffed};
 use std::borrow::ToOwned;
 use std::error::Error;
 use std::fs::File;

components/net/hsts.rs

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use net_traits::{IncludeSubdomains, IPV4_REGEX, IPV6_REGEX};
+use net_traits::{IPV4_REGEX, IPV6_REGEX, IncludeSubdomains};
 use rustc_serialize::json::{decode};
 use std::str::{from_utf8};
 use time;
@@ -131,4 +131,3 @@ pub fn secure_url(url: &Url) -> Url {
         url.clone()
     }
 }
-

components/net/http_loader.rs

@@ -8,23 +8,23 @@ use cookie_storage::CookieStorage;
 use devtools_traits::{ChromeToDevtoolsControlMsg, DevtoolsControlMsg, NetworkEvent};
 use file_loader;
 use flate2::read::{DeflateDecoder, GzDecoder};
-use hsts::{secure_url, HSTSList, HSTSEntry};
+use hsts::{HSTSEntry, HSTSList, secure_url};
 use hyper::Error as HttpError;
-use hyper::client::{Request, Response, Pool};
-use hyper::header::{AcceptEncoding, Accept, ContentLength, ContentType, Host};
-use hyper::header::{Location, qitem, StrictTransportSecurity, UserAgent, SetCookie};
-use hyper::header::{Quality, QualityItem, Headers, ContentEncoding, Encoding, Header};
+use hyper::client::{Pool, Request, Response};
+use hyper::header::{Accept, AcceptEncoding, ContentLength, ContentType, Host};
+use hyper::header::{ContentEncoding, Encoding, Header, Headers, Quality, QualityItem};
+use hyper::header::{Location, SetCookie, StrictTransportSecurity, UserAgent, qitem};
 use hyper::http::RawStatus;
 use hyper::method::Method;
-use hyper::mime::{Mime, TopLevel, SubLevel};
+use hyper::mime::{Mime, SubLevel, TopLevel};
 use hyper::net::{Fresh, HttpsConnector, Openssl};
-use hyper::status::{StatusCode, StatusClass};
+use hyper::status::{StatusClass, StatusCode};
 use log;
 use mime_classifier::MIMEClassifier;
-use net_traits::ProgressMsg::{Payload, Done};
+use net_traits::ProgressMsg::{Done, Payload};
 use net_traits::hosts::replace_hosts;
-use net_traits::{CookieSource, LoadData, Metadata, LoadConsumer, IncludeSubdomains};
-use openssl::ssl::{SslContext, SslMethod, SSL_VERIFY_PEER};
+use net_traits::{CookieSource, IncludeSubdomains, LoadConsumer, LoadData, Metadata};
+use openssl::ssl::{SSL_VERIFY_PEER, SslContext, SslMethod};
 use resource_task::{start_sending_opt, start_sending_sniffed_opt};
 use std::borrow::ToOwned;
 use std::boxed::FnBox;

components/net/image_cache_task.rs

@@ -6,16 +6,16 @@ use ipc_channel::ipc::{self, IpcSender};
 use ipc_channel::router::ROUTER;
 use net_traits::image::base::{Image, load_from_memory};
 use net_traits::image_cache_task::ImageResponder;
+use net_traits::image_cache_task::{ImageCacheChan, ImageCacheCommand, ImageCacheTask, ImageState};
 use net_traits::image_cache_task::{ImageCacheResult, ImageResponse, UsePlaceholder};
-use net_traits::image_cache_task::{ImageState, ImageCacheTask, ImageCacheChan, ImageCacheCommand};
 use net_traits::load_whole_resource;
-use net_traits::{AsyncResponseTarget, ControlMsg, LoadData, ResponseAction, ResourceTask, LoadConsumer};
+use net_traits::{AsyncResponseTarget, ControlMsg, LoadConsumer, LoadData, ResourceTask, ResponseAction};
 use std::borrow::ToOwned;
 use std::collections::HashMap;
 use std::collections::hash_map::Entry::{Occupied, Vacant};
 use std::mem;
 use std::sync::Arc;
-use std::sync::mpsc::{channel, Sender, Receiver, Select};
+use std::sync::mpsc::{Receiver, Select, Sender, channel};
 use url::Url;
 use util::resource_files::resources_dir_path;
 use util::task::spawn_named;

components/net/lib.rs

@@ -11,21 +11,21 @@
 #![feature(plugin)]
 #![plugin(plugins)]
 
-extern crate net_traits;
-extern crate cookie as cookie_rs;
-extern crate devtools_traits;
-extern crate flate2;
-extern crate euclid;
-extern crate hyper;
-extern crate ipc_channel;
-extern crate png;
 #[macro_use]
 extern crate log;
+extern crate cookie as cookie_rs;
+extern crate devtools_traits;
+extern crate euclid;
+extern crate flate2;
+extern crate hyper;
+extern crate ipc_channel;
+extern crate net_traits;
 extern crate openssl;
+extern crate png;
 extern crate rustc_serialize;
-extern crate util;
 extern crate time;
 extern crate url;
+extern crate util;
 extern crate uuid;
 
 pub mod about_loader;

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;