diff options
Diffstat (limited to 'components/net/http_loader.rs')
-rw-r--r-- | components/net/http_loader.rs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs index a2fd9f87f48..d104521c48b 100644 --- a/components/net/http_loader.rs +++ b/components/net/http_loader.rs @@ -15,8 +15,8 @@ use hsts::{HstsEntry, HstsList, secure_url}; use hyper::Error as HttpError; use hyper::LanguageTag; use hyper::client::{Pool, Request, Response}; -use hyper::header::{Accept, AcceptEncoding, ContentLength, ContentEncoding, ContentType, Host, Referer}; -use hyper::header::{Authorization, AcceptLanguage, Basic}; +use hyper::header::{Accept, AcceptEncoding, ContentEncoding, ContentLength, ContentType, Host, Referer}; +use hyper::header::{AcceptLanguage, Authorization, Basic}; use hyper::header::{Encoding, Header, Headers, Quality, QualityItem}; use hyper::header::{Location, SetCookie, StrictTransportSecurity, UserAgent, qitem}; use hyper::http::RawStatus; @@ -29,16 +29,16 @@ use ipc_channel::ipc::{self, IpcSender}; use log; use mime_classifier::MimeClassifier; use msg::constellation_msg::{PipelineId, ReferrerPolicy}; +use net_traits::{CookieSource, IncludeSubdomains, LoadConsumer, LoadContext, LoadData}; +use net_traits::{CustomResponse, CustomResponseMediator, Metadata, NetworkError}; use net_traits::ProgressMsg::{Done, Payload}; use net_traits::hosts::replace_hosts; use net_traits::response::HttpsState; -use net_traits::{CookieSource, IncludeSubdomains, LoadConsumer, LoadContext, LoadData}; -use net_traits::{Metadata, NetworkError, CustomResponse, CustomResponseMediator}; use openssl; -use openssl::ssl::error::{SslError, OpensslError}; -use profile_traits::time::{ProfilerCategory, profile, ProfilerChan, TimerMetadata}; -use profile_traits::time::{TimerMetadataReflowType, TimerMetadataFrameType}; -use resource_thread::{CancellationListener, send_error, start_sending_sniffed_opt, AuthCache, AuthCacheEntry}; +use openssl::ssl::error::{OpensslError, SslError}; +use profile_traits::time::{ProfilerCategory, ProfilerChan, TimerMetadata, profile}; +use profile_traits::time::{TimerMetadataFrameType, TimerMetadataReflowType}; +use resource_thread::{AuthCache, AuthCacheEntry, CancellationListener, send_error, start_sending_sniffed_opt}; use std::borrow::ToOwned; use std::boxed::FnBox; use std::collections::HashSet; @@ -46,13 +46,13 @@ use std::error::Error; use std::fmt; use std::io::{self, Cursor, Read, Write}; use std::ops::Deref; -use std::sync::mpsc::Sender; use std::sync::{Arc, RwLock}; +use std::sync::mpsc::Sender; use time; use time::Tm; #[cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))] use tinyfiledialogs; -use url::{Url, Position}; +use url::{Position, Url}; use util::prefs::PREFS; use util::thread::spawn_named; use uuid; |