aboutsummaryrefslogtreecommitdiffstats
path: root/components/net/image_cache_thread.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/image_cache_thread.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/image_cache_thread.rs')
-rw-r--r--components/net/image_cache_thread.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/components/net/image_cache_thread.rs b/components/net/image_cache_thread.rs
index b18cc22dc01..92c0aa0fd83 100644
--- a/components/net/image_cache_thread.rs
+++ b/components/net/image_cache_thread.rs
@@ -3,15 +3,15 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use immeta::load_from_buf;
-use ipc_channel::ipc::{self, IpcSender, IpcReceiver};
+use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
use ipc_channel::router::ROUTER;
use msg::constellation_msg::{PipelineId, ReferrerPolicy};
-use net_traits::image::base::{Image, ImageMetadata, load_from_memory, PixelFormat};
-use net_traits::image_cache_thread::ImageResponder;
+use net_traits::{AsyncResponseTarget, CoreResourceMsg, CoreResourceThread, LoadConsumer, LoadData, LoadOrigin};
+use net_traits::{LoadContext, NetworkError, ResponseAction};
+use net_traits::image::base::{Image, ImageMetadata, PixelFormat, load_from_memory};
use net_traits::image_cache_thread::{ImageCacheChan, ImageCacheCommand, ImageCacheThread, ImageState};
use net_traits::image_cache_thread::{ImageCacheResult, ImageOrMetadataAvailable, ImageResponse, UsePlaceholder};
-use net_traits::{AsyncResponseTarget, CoreResourceMsg, LoadConsumer, LoadData, CoreResourceThread, LoadOrigin};
-use net_traits::{ResponseAction, LoadContext, NetworkError};
+use net_traits::image_cache_thread::ImageResponder;
use std::borrow::ToOwned;
use std::collections::HashMap;
use std::collections::hash_map::Entry::{Occupied, Vacant};
@@ -19,7 +19,7 @@ use std::fs::File;
use std::io::{self, Read};
use std::mem;
use std::sync::Arc;
-use std::sync::mpsc::{Sender, Receiver, channel};
+use std::sync::mpsc::{Receiver, Sender, channel};
use threadpool::ThreadPool;
use url::Url;
use util::resource_files::resources_dir_path;