auto merge of #4886 : Ms2ger/servo/servo_msg, r=saneyuki

5 files changed, 9 insertions, 9 deletions

diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs
index 0eca6f00a14..155e1606be7 100644
--- a/components/script/dom/bindings/trace.rs
+++ b/components/script/dom/bindings/trace.rs
@@ -44,8 +44,8 @@ use msg::constellation_msg::{PipelineId, SubpageId, WindowSizeData};
 use net::image_cache_task::ImageCacheTask;
 use script_traits::ScriptControlChan;
 use script_traits::UntrustedNodeAddress;
-use servo_msg::compositor_msg::ScriptListener;
-use servo_msg::constellation_msg::ConstellationChan;
+use msg::compositor_msg::ScriptListener;
+use msg::constellation_msg::ConstellationChan;
 use util::smallvec::{SmallVec1, SmallVec};
 use util::str::{LengthOrPercentageOrAuto};
 use std::cell::{Cell, RefCell};
diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs
index 74f789ab491..04b1c5019c3 100644
--- a/components/script/dom/htmlformelement.rs
+++ b/components/script/dom/htmlformelement.rs
@@ -25,7 +25,7 @@ use dom::node::{Node, NodeHelpers, NodeTypeId, document_from_node, window_from_n
 use hyper::method::Method;
 use hyper::header::common::ContentType;
 use hyper::mime;
-use servo_msg::constellation_msg::LoadData;
+use msg::constellation_msg::LoadData;
 use util::str::DOMString;
 use script_task::{ScriptChan, ScriptMsg};
 use std::ascii::OwnedAsciiExt;
diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs
index bb310607b1b..b4f9b577b7b 100644
--- a/components/script/dom/htmliframeelement.rs
+++ b/components/script/dom/htmliframeelement.rs
@@ -23,9 +23,9 @@ use dom::virtualmethods::VirtualMethods;
 use dom::window::Window;
 use page::{IterablePage, Page};
 
-use servo_msg::constellation_msg::{PipelineId, SubpageId, ConstellationChan};
-use servo_msg::constellation_msg::IFrameSandboxState::{IFrameSandboxed, IFrameUnsandboxed};
-use servo_msg::constellation_msg::Msg as ConstellationMsg;
+use msg::constellation_msg::{PipelineId, SubpageId, ConstellationChan};
+use msg::constellation_msg::IFrameSandboxState::{IFrameSandboxed, IFrameUnsandboxed};
+use msg::constellation_msg::Msg as ConstellationMsg;
 use util::str::DOMString;
 use string_cache::Atom;
 
diff --git a/components/script/dom/keyboardevent.rs b/components/script/dom/keyboardevent.rs
index f220f90a36a..8ff5fe27e63 100644
--- a/components/script/dom/keyboardevent.rs
+++ b/components/script/dom/keyboardevent.rs
@@ -13,7 +13,7 @@ use dom::bindings::utils::{Reflectable, reflect_dom_object};
 use dom::event::{Event, EventTypeId};
 use dom::uievent::UIEvent;
 use dom::window::Window;
-use servo_msg::constellation_msg;
+use msg::constellation_msg;
 use util::str::DOMString;
 
 use std::borrow::ToOwned;
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
index ef4d6f14e2d..98947376cc2 100644
--- a/components/script/dom/window.rs
+++ b/components/script/dom/window.rs
@@ -33,8 +33,8 @@ use script_task::ScriptMsg;
 use script_traits::ScriptControlChan;
 use timers::{IsInterval, TimerId, TimerManager, TimerCallback};
 
-use servo_msg::compositor_msg::ScriptListener;
-use servo_msg::constellation_msg::LoadData;
+use msg::compositor_msg::ScriptListener;
+use msg::constellation_msg::LoadData;
 use servo_net::image_cache_task::ImageCacheTask;
 use servo_net::storage_task::StorageTask;
 use util::str::{DOMString,HTML_SPACE_CHARACTERS};