aboutsummaryrefslogtreecommitdiffstats
path: root/components/script_traits
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-11-04 05:26:27 -0500
committerGitHub <noreply@github.com>2016-11-04 05:26:27 -0500
commitbe58dc36e85414a4d47e6c69f1dd520d300cb50c (patch)
treebfd5a8f243416e2536830fa19fba9fa4b626e602 /components/script_traits
parent4c5d84d81a45a2f85ceca88ca69374b464722cd1 (diff)
parent277c6d0154731c426bbf3fa76aeb63444b812eea (diff)
downloadservo-be58dc36e85414a4d47e6c69f1dd520d300cb50c.tar.gz
servo-be58dc36e85414a4d47e6c69f1dd520d300cb50c.zip
Auto merge of #13816 - servo:msg-crate, r=nox
Move some types out of msg. <!-- 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/13816) <!-- Reviewable:end -->
Diffstat (limited to 'components/script_traits')
-rw-r--r--components/script_traits/lib.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs
index a308c9e3dab..557d1eb1139 100644
--- a/components/script_traits/lib.rs
+++ b/components/script_traits/lib.rs
@@ -55,8 +55,8 @@ use hyper::method::Method;
use ipc_channel::ipc::{IpcReceiver, IpcSender};
use libc::c_void;
use msg::constellation_msg::{FrameId, FrameType, Key, KeyModifiers, KeyState};
-use msg::constellation_msg::{PipelineId, PipelineNamespaceId, ReferrerPolicy, TraversalDirection};
-use net_traits::ResourceThreads;
+use msg::constellation_msg::{PipelineId, PipelineNamespaceId, TraversalDirection};
+use net_traits::{ReferrerPolicy, ResourceThreads};
use net_traits::image::base::Image;
use net_traits::image_cache_thread::ImageCacheThread;
use net_traits::response::HttpsState;