Reorder imports

6 files changed, 36 insertions, 25 deletions

diff --git a/components/net/tests/data_loader.rs b/components/net/tests/data_loader.rs
index 5ab5c68943f..9996aed73e6 100644
--- a/components/net/tests/data_loader.rs
+++ b/components/net/tests/data_loader.rs
@@ -7,9 +7,9 @@ use headers_core::HeaderMapExt;
 use headers_ext::ContentType;
 use hyper_serde::Serde;
 use mime::{self, Mime};
-use net_traits::{FetchMetadata, FilteredMetadata, NetworkError};
 use net_traits::request::{Origin, Request};
 use net_traits::response::ResponseBody;
+use net_traits::{FetchMetadata, FilteredMetadata, NetworkError};
 use servo_url::ServoUrl;
 use std::ops::Deref;
 
diff --git a/components/net/tests/fetch.rs b/components/net/tests/fetch.rs
index a11d068e9ce..2414bb153e9 100644
--- a/components/net/tests/fetch.rs
+++ b/components/net/tests/fetch.rs
@@ -2,21 +2,28 @@
  * 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 crate::{DEFAULT_USER_AGENT, new_fetch_context, create_embedder_proxy, fetch, make_server, make_ssl_server};
 use crate::fetch_with_context;
 use crate::fetch_with_cors_cache;
 use crate::http_loader::{expect_devtools_http_request, expect_devtools_http_response};
+use crate::{
+    create_embedder_proxy, fetch, make_server, make_ssl_server, new_fetch_context,
+    DEFAULT_USER_AGENT,
+};
 use devtools_traits::HttpRequest as DevtoolsHttpRequest;
 use devtools_traits::HttpResponse as DevtoolsHttpResponse;
 use headers_core::HeaderMapExt;
-use headers_ext::{AccessControlAllowCredentials, AccessControlAllowHeaders, AccessControlAllowOrigin};
+use headers_ext::{
+    AccessControlAllowCredentials, AccessControlAllowHeaders, AccessControlAllowOrigin,
+};
 use headers_ext::{AccessControlAllowMethods, AccessControlMaxAge};
-use headers_ext::{CacheControl, ContentLength, ContentType, Expires, Host, LastModified, Pragma, UserAgent};
-use http::{Method, StatusCode};
+use headers_ext::{
+    CacheControl, ContentLength, ContentType, Expires, Host, LastModified, Pragma, UserAgent,
+};
 use http::header::{self, HeaderMap, HeaderName, HeaderValue};
 use http::uri::Authority;
-use hyper::{Request as HyperRequest, Response as HyperResponse};
+use http::{Method, StatusCode};
 use hyper::body::Body;
+use hyper::{Request as HyperRequest, Response as HyperResponse};
 use mime::{self, Mime};
 use msg::constellation_msg::TEST_PIPELINE_ID;
 use net::connector::create_ssl_connector_builder;
@@ -25,20 +32,20 @@ use net::fetch::methods::{CancellationListener, FetchContext};
 use net::filemanager_thread::FileManager;
 use net::hsts::HstsEntry;
 use net::test::HttpState;
+use net_traits::request::{Destination, Origin, RedirectMode, Referrer, Request, RequestMode};
+use net_traits::response::{CacheState, Response, ResponseBody, ResponseType};
 use net_traits::IncludeSubdomains;
 use net_traits::NetworkError;
 use net_traits::ReferrerPolicy;
-use net_traits::request::{Destination, Origin, RedirectMode, Referrer, Request, RequestMode};
-use net_traits::response::{CacheState, Response, ResponseBody, ResponseType};
 use servo_channel::{channel, Sender};
 use servo_url::{ImmutableOrigin, ServoUrl};
 use std::fs::File;
 use std::io::Read;
 use std::iter::FromIterator;
 use std::path::Path;
-use std::sync::{Arc, Mutex};
 use std::sync::atomic::{AtomicUsize, Ordering};
-use std::time::{SystemTime, Duration};
+use std::sync::{Arc, Mutex};
+use std::time::{Duration, SystemTime};
 
 // TODO write a struct that impls Handler for storing test values
 
diff --git a/components/net/tests/filemanager_thread.rs b/components/net/tests/filemanager_thread.rs
index 35634cad815..50141326722 100644
--- a/components/net/tests/filemanager_thread.rs
+++ b/components/net/tests/filemanager_thread.rs
@@ -7,7 +7,9 @@ use embedder_traits::FilterPattern;
 use ipc_channel::ipc;
 use net::filemanager_thread::FileManager;
 use net_traits::blob_url_store::BlobURLStoreError;
-use net_traits::filemanager_thread::{FileManagerThreadMsg, FileManagerThreadError, ReadFileProgress};
+use net_traits::filemanager_thread::{
+    FileManagerThreadError, FileManagerThreadMsg, ReadFileProgress,
+};
 use servo_config::prefs::{PrefValue, PREFS};
 use std::fs::File;
 use std::io::Read;
diff --git a/components/net/tests/http_loader.rs b/components/net/tests/http_loader.rs
index ee2c12b9981..bc5112f1f58 100644
--- a/components/net/tests/http_loader.rs
+++ b/components/net/tests/http_loader.rs
@@ -7,35 +7,37 @@ use crate::fetch;
 use crate::fetch_with_context;
 use crate::make_server;
 use crate::new_fetch_context;
-use devtools_traits::{ChromeToDevtoolsControlMsg, DevtoolsControlMsg, NetworkEvent};
 use devtools_traits::HttpRequest as DevtoolsHttpRequest;
 use devtools_traits::HttpResponse as DevtoolsHttpResponse;
-use flate2::Compression;
+use devtools_traits::{ChromeToDevtoolsControlMsg, DevtoolsControlMsg, NetworkEvent};
 use flate2::write::{DeflateEncoder, GzEncoder};
+use flate2::Compression;
 use futures::{self, Future, Stream};
 use headers_core::HeaderMapExt;
-use headers_ext::{Authorization, Basic, AccessControlAllowOrigin, ContentLength, Date, Host, Origin};
+use headers_ext::{
+    AccessControlAllowOrigin, Authorization, Basic, ContentLength, Date, Host, Origin,
+};
 use headers_ext::{StrictTransportSecurity, UserAgent};
-use http::{Method, StatusCode};
 use http::header::{self, HeaderMap, HeaderValue};
 use http::uri::Authority;
-use hyper::{Request as HyperRequest, Response as HyperResponse};
+use http::{Method, StatusCode};
 use hyper::body::Body;
+use hyper::{Request as HyperRequest, Response as HyperResponse};
 use msg::constellation_msg::TEST_PIPELINE_ID;
 use net::cookie::Cookie;
 use net::cookie_storage::CookieStorage;
 use net::resource_thread::AuthCacheEntry;
 use net::test::replace_host_table;
-use net_traits::{CookieSource, NetworkError};
-use net_traits::request::{Request, RequestInit, RequestMode, CredentialsMode, Destination};
+use net_traits::request::{CredentialsMode, Destination, Request, RequestInit, RequestMode};
 use net_traits::response::ResponseBody;
+use net_traits::{CookieSource, NetworkError};
 use servo_channel::{channel, Receiver};
-use servo_url::{ServoUrl, ImmutableOrigin};
+use servo_url::{ImmutableOrigin, ServoUrl};
 use std::collections::HashMap;
 use std::io::Write;
 use std::str;
-use std::sync::{Arc, Mutex, RwLock};
 use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::{Arc, Mutex, RwLock};
 use std::time::Duration;
 
 fn mock_origin() -> ImmutableOrigin {
diff --git a/components/net/tests/main.rs b/components/net/tests/main.rs
index c20c846bf7d..aa7a6aa9cf6 100644
--- a/components/net/tests/main.rs
+++ b/components/net/tests/main.rs
@@ -44,21 +44,21 @@ mod resource_thread;
 mod subresource_integrity;
 
 use devtools_traits::DevtoolsControlMsg;
-use embedder_traits::{EmbedderProxy, EventLoopWaker};
 use embedder_traits::resources::{self, Resource};
+use embedder_traits::{EmbedderProxy, EventLoopWaker};
 use futures::{Future, Stream};
-use hyper::{Body, Request as HyperRequest, Response as HyperResponse};
-use hyper::server::Server as HyperServer;
 use hyper::server::conn::Http;
+use hyper::server::Server as HyperServer;
 use hyper::service::service_fn_ok;
+use hyper::{Body, Request as HyperRequest, Response as HyperResponse};
 use net::connector::create_ssl_connector_builder;
 use net::fetch::cors_cache::CorsCache;
 use net::fetch::methods::{self, CancellationListener, FetchContext};
 use net::filemanager_thread::FileManager;
 use net::test::HttpState;
-use net_traits::FetchTaskTarget;
 use net_traits::request::Request;
 use net_traits::response::Response;
+use net_traits::FetchTaskTarget;
 use openssl::ssl::{SslAcceptor, SslFiletype, SslMethod};
 use servo_channel::{channel, Sender};
 use servo_url::ServoUrl;
diff --git a/components/net/tests/subresource_integrity.rs b/components/net/tests/subresource_integrity.rs
index 7607fc378b7..3cd5ac2b017 100644
--- a/components/net/tests/subresource_integrity.rs
+++ b/components/net/tests/subresource_integrity.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::subresource_integrity::{SriEntry, get_prioritized_hash_function, get_strongest_metadata};
+use net::subresource_integrity::{get_prioritized_hash_function, get_strongest_metadata, SriEntry};
 use net::subresource_integrity::{is_response_integrity_valid, parsed_metadata};
 use net_traits::response::{Response, ResponseBody};
 use servo_url::ServoUrl;