aboutsummaryrefslogtreecommitdiffstats
path: root/components/net/blob_loader.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-09-08 22:19:19 -0500
committerGitHub <noreply@github.com>2016-09-08 22:19:19 -0500
commit3117787fd2a8b7748cfde1e9b8c5be3c00f2c599 (patch)
treea8855004b4309212182505b0cf72f116d846c4cb /components/net/blob_loader.rs
parent5a5a76cc5db830d2e622d4e0924837383b64dfa2 (diff)
parent93a103ba7306b578841b73a0ecfbccaad8fc78c1 (diff)
downloadservo-3117787fd2a8b7748cfde1e9b8c5be3c00f2c599.tar.gz
servo-3117787fd2a8b7748cfde1e9b8c5be3c00f2c599.zip
Auto merge of #13205 - UK992:tidy-sort, r=Wafflespeanut
Tidy: Fix ordering use statements with braces This hack fixes https://github.com/servo/servo/issues/7412 and matches behavior with rustfmt. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13205) <!-- Reviewable:end -->
Diffstat (limited to 'components/net/blob_loader.rs')
-rw-r--r--components/net/blob_loader.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/components/net/blob_loader.rs b/components/net/blob_loader.rs
index 1fe15d9a4a5..1bf931dac32 100644
--- a/components/net/blob_loader.rs
+++ b/components/net/blob_loader.rs
@@ -3,19 +3,19 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use filemanager_thread::{FileManager, UIProvider};
-use hyper::header::{DispositionType, ContentDisposition, DispositionParam};
-use hyper::header::{Headers, ContentType, ContentLength, Charset};
+use hyper::header::{Charset, ContentLength, ContentType, Headers};
+use hyper::header::{ContentDisposition, DispositionParam, DispositionType};
use hyper_serde::Serde;
use ipc_channel::ipc;
-use mime::{Mime, Attr};
+use mime::{Attr, Mime};
use mime_classifier::MimeClassifier;
-use net_traits::ProgressMsg::{Payload, Done};
+use net_traits::{LoadConsumer, LoadData, Metadata, NetworkError};
+use net_traits::ProgressMsg::{Done, Payload};
use net_traits::blob_url_store::parse_blob_url;
use net_traits::filemanager_thread::{FileManagerThreadMsg, ReadFileProgress};
use net_traits::response::HttpsState;
-use net_traits::{LoadConsumer, LoadData, Metadata, NetworkError};
+use resource_thread::{send_error, start_sending_sniffed_opt};
use resource_thread::CancellationListener;
-use resource_thread::{start_sending_sniffed_opt, send_error};
use std::boxed::FnBox;
use std::sync::Arc;
use util::thread::spawn_named;