Sort use statements

components/net/fetch/methods.rs

@@ -4,11 +4,12 @@
 
 use crate::blob_loader::load_blob_sync;
 use crate::data_loader::decode;
-use devtools_traits::DevtoolsControlMsg;
 use crate::fetch::cors_cache::CorsCache;
 use crate::filemanager_thread::FileManager;
 use crate::http_loader::{HttpState, determine_request_referrer, http_fetch};
 use crate::http_loader::{set_default_accept, set_default_accept_language};
+use crate::subresource_integrity::is_response_integrity_valid;
+use devtools_traits::DevtoolsControlMsg;
 use headers_core::HeaderMapExt;
 use headers_ext::{AccessControlExposeHeaders, ContentType, Range};
 use http::header::{self, HeaderMap, HeaderName, HeaderValue};
@@ -32,7 +33,6 @@ use std::str;
 use std::sync::{Arc, Mutex};
 use std::sync::atomic::Ordering;
 use std::thread;
-use crate::subresource_integrity::is_response_integrity_valid;
 
 lazy_static! {
     static ref X_CONTENT_TYPE_OPTIONS: HeaderName =

components/net/http_loader.rs

@@ -7,14 +7,15 @@ use bytes::Bytes;
 use crate::connector::{BUF_SIZE, Connector, create_http_client, WrappedBody};
 use crate::cookie;
 use crate::cookie_storage::CookieStorage;
-use devtools_traits::{ChromeToDevtoolsControlMsg, DevtoolsControlMsg, HttpRequest as DevtoolsHttpRequest};
-use devtools_traits::{HttpResponse as DevtoolsHttpResponse, NetworkEvent};
 use crate::fetch::cors_cache::CorsCache;
 use crate::fetch::methods::{Data, DoneChannel, FetchContext, Target};
 use crate::fetch::methods::{is_cors_safelisted_request_header, is_cors_safelisted_method, main_fetch};
-use flate2::read::{DeflateDecoder, GzDecoder};
 use crate::hsts::HstsList;
 use crate::http_cache::HttpCache;
+use crate::resource_thread::AuthCache;
+use devtools_traits::{ChromeToDevtoolsControlMsg, DevtoolsControlMsg, HttpRequest as DevtoolsHttpRequest};
+use devtools_traits::{HttpResponse as DevtoolsHttpResponse, NetworkEvent};
+use flate2::read::{DeflateDecoder, GzDecoder};
 use headers_core::HeaderMapExt;
 use headers_ext::{AccessControlAllowCredentials, AccessControlAllowHeaders};
 use headers_ext::{AccessControlAllowMethods, AccessControlRequestHeaders, AccessControlRequestMethod, Authorization};
@@ -36,7 +37,6 @@ use net_traits::request::{RedirectMode, Referrer, Request, RequestMode};
 use net_traits::request::{ResponseTainting, ServiceWorkersMode};
 use net_traits::response::{HttpsState, Response, ResponseBody, ResponseType};
 use openssl::ssl::SslConnectorBuilder;
-use crate::resource_thread::AuthCache;
 use servo_channel::{channel, Sender};
 use servo_url::{ImmutableOrigin, ServoUrl};
 use std::collections::{HashMap, HashSet};

components/net/resource_thread.rs

@@ -7,15 +7,17 @@ use crate::connector::{create_http_client, create_ssl_connector_builder};
 use crate::cookie;
 use crate::cookie_rs;
 use crate::cookie_storage::CookieStorage;
-use devtools_traits::DevtoolsControlMsg;
-use embedder_traits::EmbedderProxy;
-use embedder_traits::resources::{self, Resource};
 use crate::fetch::cors_cache::CorsCache;
 use crate::fetch::methods::{CancellationListener, FetchContext, fetch};
 use crate::filemanager_thread::FileManager;
 use crate::hsts::HstsList;
 use crate::http_cache::HttpCache;
 use crate::http_loader::{HANDLE, HttpState, http_redirect_fetch};
+use crate::storage_thread::StorageThreadFactory;
+use crate::websocket_loader;
+use devtools_traits::DevtoolsControlMsg;
+use embedder_traits::EmbedderProxy;
+use embedder_traits::resources::{self, Resource};
 use hyper_serde::Serde;
 use ipc_channel::ipc::{self, IpcReceiver, IpcReceiverSet, IpcSender};
 use malloc_size_of::{MallocSizeOf, MallocSizeOfOps};
@@ -44,8 +46,6 @@ use std::ops::Deref;
 use std::path::{Path, PathBuf};
 use std::sync::{Arc, Mutex, RwLock};
 use std::thread;
-use crate::storage_thread::StorageThreadFactory;
-use crate::websocket_loader;
 
 /// Returns a tuple of (public, private) senders to the new threads.
 pub fn new_resource_threads(

components/net/storage_thread.rs

@@ -2,9 +2,9 @@
  * 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::resource_thread;
 use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
 use net_traits::storage_thread::{StorageThreadMsg, StorageType};
-use crate::resource_thread;
 use servo_url::ServoUrl;
 use std::borrow::ToOwned;
 use std::collections::BTreeMap;

components/net/tests/fetch.rs

@@ -3,10 +3,11 @@
  * 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 devtools_traits::HttpRequest as DevtoolsHttpRequest;
-use devtools_traits::HttpResponse as DevtoolsHttpResponse;
 use crate::fetch_with_context;
 use crate::fetch_with_cors_cache;
+use crate::http_loader::{expect_devtools_http_request, expect_devtools_http_response};
+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::{AccessControlAllowMethods, AccessControlMaxAge};
@@ -14,7 +15,6 @@ use headers_ext::{CacheControl, ContentLength, ContentType, Expires, Host, LastM
 use http::{Method, StatusCode};
 use http::header::{self, HeaderMap, HeaderName, HeaderValue};
 use http::uri::Authority;
-use crate::http_loader::{expect_devtools_http_request, expect_devtools_http_response};
 use hyper::{Request as HyperRequest, Response as HyperResponse};
 use hyper::body::Body;
 use mime::{self, Mime};

components/net/tests/http_loader.rs

@@ -3,11 +3,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use crate::cookie_rs::Cookie as CookiePair;
+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 crate::fetch;
-use crate::fetch_with_context;
 use flate2::Compression;
 use flate2::write::{DeflateEncoder, GzEncoder};
 use futures::{self, Future, Stream};
@@ -19,7 +21,6 @@ use http::header::{self, HeaderMap, HeaderValue};
 use http::uri::Authority;
 use hyper::{Request as HyperRequest, Response as HyperResponse};
 use hyper::body::Body;
-use crate::make_server;
 use msg::constellation_msg::TEST_PIPELINE_ID;
 use net::cookie::Cookie;
 use net::cookie_storage::CookieStorage;
@@ -28,7 +29,6 @@ use net::test::replace_host_table;
 use net_traits::{CookieSource, NetworkError};
 use net_traits::request::{Request, RequestInit, RequestMode, CredentialsMode, Destination};
 use net_traits::response::ResponseBody;
-use crate::new_fetch_context;
 use servo_channel::{channel, Receiver};
 use servo_url::{ServoUrl, ImmutableOrigin};
 use std::collections::HashMap;

components/net/websocket_loader.rs

@@ -4,11 +4,11 @@
 
 use crate::connector::create_ssl_connector_builder;
 use crate::cookie::Cookie;
-use embedder_traits::resources::{self, Resource};
 use crate::fetch::methods::should_be_blocked_due_to_bad_port;
-use headers_ext::Host;
 use crate::hosts::replace_host;
 use crate::http_loader::HttpState;
+use embedder_traits::resources::{self, Resource};
+use headers_ext::Host;
 use http::header::{self, HeaderMap, HeaderName, HeaderValue};
 use http::uri::Authority;
 use ipc_channel::ipc::{IpcReceiver, IpcSender};