servo: Merge #4886 - Import msg as msg rather than servo_msg (from Ms2ger:servo_msg); r=saneyuki

Source-Repo: https://github.com/servo/servo
Source-Revision: 29d3b872de4abb693b75e71fc0b987c52b0fd1f6

servo/components/compositing/compositor.rs

@@ -29,12 +29,12 @@ use png;
 use gleam::gl::types::{GLint, GLsizei};
 use gleam::gl;
 use script_traits::{ConstellationControlMsg, ScriptControlChan};
-use servo_msg::compositor_msg::{Epoch, LayerId};
-use servo_msg::compositor_msg::{ReadyState, PaintState, ScrollPolicy};
-use servo_msg::constellation_msg::{ConstellationChan, NavigationDirection};
-use servo_msg::constellation_msg::Msg as ConstellationMsg;
-use servo_msg::constellation_msg::{Key, KeyModifiers, KeyState, LoadData};
-use servo_msg::constellation_msg::{PipelineId, WindowSizeData};
+use msg::compositor_msg::{Epoch, LayerId};
+use msg::compositor_msg::{ReadyState, PaintState, ScrollPolicy};
+use msg::constellation_msg::{ConstellationChan, NavigationDirection};
+use msg::constellation_msg::Msg as ConstellationMsg;
+use msg::constellation_msg::{Key, KeyModifiers, KeyState, LoadData};
+use msg::constellation_msg::{PipelineId, WindowSizeData};
 use util::geometry::{PagePx, ScreenPx, ViewportPx};
 use util::memory::MemoryProfilerChan;
 use util::opts;

servo/components/compositing/compositor_layer.rs

@@ -18,8 +18,8 @@ use layers::geometry::LayerPixel;
 use layers::layers::{Layer, LayerBufferSet};
 use script_traits::CompositorEvent::{ClickEvent, MouseDownEvent, MouseMoveEvent, MouseUpEvent};
 use script_traits::{ScriptControlChan, ConstellationControlMsg};
-use servo_msg::compositor_msg::{Epoch, LayerId, ScrollPolicy};
-use servo_msg::constellation_msg::PipelineId;
+use msg::compositor_msg::{Epoch, LayerId, ScrollPolicy};
+use msg::constellation_msg::PipelineId;
 use std::num::Float;
 use std::rc::Rc;
 

servo/components/compositing/compositor_task.rs

@@ -18,10 +18,10 @@ use geom::size::Size2D;
 use layers::platform::surface::{NativeCompositingGraphicsContext, NativeGraphicsMetadata};
 use layers::layers::LayerBufferSet;
 use pipeline::CompositionPipeline;
-use servo_msg::compositor_msg::{Epoch, LayerId, LayerMetadata, ReadyState};
-use servo_msg::compositor_msg::{PaintListener, PaintState, ScriptListener, ScrollPolicy};
-use servo_msg::constellation_msg::{ConstellationChan, LoadData, PipelineId};
-use servo_msg::constellation_msg::{Key, KeyState, KeyModifiers};
+use msg::compositor_msg::{Epoch, LayerId, LayerMetadata, ReadyState};
+use msg::compositor_msg::{PaintListener, PaintState, ScriptListener, ScrollPolicy};
+use msg::constellation_msg::{ConstellationChan, LoadData, PipelineId};
+use msg::constellation_msg::{Key, KeyState, KeyModifiers};
 use util::cursor::Cursor;
 use util::geometry::PagePx;
 use util::memory::MemoryProfilerChan;

servo/components/compositing/constellation.rs

@@ -16,14 +16,14 @@ use layout_traits::LayoutTaskFactory;
 use libc;
 use script_traits::{CompositorEvent, ConstellationControlMsg};
 use script_traits::{ScriptControlChan, ScriptTaskFactory};
-use servo_msg::compositor_msg::LayerId;
-use servo_msg::constellation_msg::{self, ConstellationChan, Failure};
-use servo_msg::constellation_msg::{IFrameSandboxState, NavigationDirection};
-use servo_msg::constellation_msg::{Key, KeyState, KeyModifiers};
-use servo_msg::constellation_msg::{LoadData, NavigationType};
-use servo_msg::constellation_msg::{PipelineExitType, PipelineId};
-use servo_msg::constellation_msg::{SubpageId, WindowSizeData};
-use servo_msg::constellation_msg::Msg as ConstellationMsg;
+use msg::compositor_msg::LayerId;
+use msg::constellation_msg::{self, ConstellationChan, Failure};
+use msg::constellation_msg::{IFrameSandboxState, NavigationDirection};
+use msg::constellation_msg::{Key, KeyState, KeyModifiers};
+use msg::constellation_msg::{LoadData, NavigationType};
+use msg::constellation_msg::{PipelineExitType, PipelineId};
+use msg::constellation_msg::{SubpageId, WindowSizeData};
+use msg::constellation_msg::Msg as ConstellationMsg;
 use servo_net::image_cache_task::{ImageCacheTask, ImageCacheTaskClient};
 use servo_net::resource_task::ResourceTask;
 use servo_net::resource_task;

servo/components/compositing/headless.rs

@@ -7,8 +7,8 @@ use windowing::WindowEvent;
 
 use geom::scale_factor::ScaleFactor;
 use geom::size::TypedSize2D;
-use servo_msg::constellation_msg::Msg as ConstellationMsg;
-use servo_msg::constellation_msg::{ConstellationChan, WindowSizeData};
+use msg::constellation_msg::Msg as ConstellationMsg;
+use msg::constellation_msg::{ConstellationChan, WindowSizeData};
 use util::memory::MemoryProfilerChan;
 use util::memory;
 use util::time::TimeProfilerChan;

servo/components/compositing/lib.rs

@@ -19,7 +19,7 @@ extern crate layers;
 extern crate layout_traits;
 extern crate png;
 extern crate script_traits;
-extern crate "msg" as servo_msg;
+extern crate msg;
 extern crate "net" as servo_net;
 #[macro_use]
 extern crate util;

servo/components/compositing/pipeline.rs

@@ -10,10 +10,10 @@ use script_traits::{NewLayoutInfo, ConstellationControlMsg};
 use devtools_traits::DevtoolsControlChan;
 use gfx::paint_task::Msg as PaintMsg;
 use gfx::paint_task::{PaintChan, PaintTask};
-use servo_msg::constellation_msg::{ConstellationChan, Failure, PipelineId, SubpageId};
-use servo_msg::constellation_msg::{LoadData, WindowSizeData, PipelineExitType};
-use servo_net::image_cache_task::ImageCacheTask;
 use gfx::font_cache_task::FontCacheTask;
+use msg::constellation_msg::{ConstellationChan, Failure, PipelineId, SubpageId};
+use msg::constellation_msg::{LoadData, WindowSizeData, PipelineExitType};
+use servo_net::image_cache_task::ImageCacheTask;
 use servo_net::resource_task::ResourceTask;
 use servo_net::storage_task::StorageTask;
 use util::time::TimeProfilerChan;

servo/components/compositing/windowing.rs

@@ -11,8 +11,8 @@ use geom::scale_factor::ScaleFactor;
 use geom::size::TypedSize2D;
 use layers::geometry::DevicePixel;
 use layers::platform::surface::NativeGraphicsMetadata;
-use servo_msg::compositor_msg::{PaintState, ReadyState};
-use servo_msg::constellation_msg::{Key, KeyState, KeyModifiers, LoadData};
+use msg::compositor_msg::{PaintState, ReadyState};
+use msg::constellation_msg::{Key, KeyState, KeyModifiers, LoadData};
 use util::cursor::Cursor;
 use util::geometry::ScreenPx;
 use std::fmt::{Error, Formatter, Show};

servo/components/devtools/actors/console.rs

@@ -11,7 +11,7 @@ use protocol::JsonPacketStream;
 
 use devtools_traits::{EvaluateJS, NullValue, VoidValue, NumberValue, StringValue, BooleanValue};
 use devtools_traits::{ActorValue, DevtoolScriptControlMsg};
-use servo_msg::constellation_msg::PipelineId;
+use msg::constellation_msg::PipelineId;
 
 use collections::BTreeMap;
 use core::cell::RefCell;

servo/components/devtools/actors/inspector.rs

@@ -11,7 +11,7 @@ use actor::{Actor, ActorRegistry};
 use protocol::JsonPacketStream;
 
 use collections::BTreeMap;
-use servo_msg::constellation_msg::PipelineId;
+use msg::constellation_msg::PipelineId;
 use serialize::json::{self, Json, ToJson};
 use std::cell::RefCell;
 use std::io::TcpStream;

servo/components/devtools/lib.rs

@@ -24,7 +24,7 @@ extern crate core;
 extern crate devtools_traits;
 extern crate "serialize" as rustc_serialize;
 extern crate serialize;
-extern crate "msg" as servo_msg;
+extern crate msg;
 extern crate time;
 extern crate util;
 
@@ -37,7 +37,7 @@ use protocol::JsonPacketStream;
 
 use devtools_traits::{ServerExitMsg, DevtoolsControlMsg, NewGlobal, DevtoolScriptControlMsg};
 use devtools_traits::{DevtoolsPageInfo, SendConsoleMessage, ConsoleMessage};
-use servo_msg::constellation_msg::PipelineId;
+use msg::constellation_msg::PipelineId;
 use util::task::spawn_named;
 
 use std::borrow::ToOwned;

servo/components/devtools_traits/lib.rs

@@ -15,7 +15,7 @@
 #![allow(missing_copy_implementations)]
 #![allow(unstable)]
 
-extern crate "msg" as servo_msg;
+extern crate msg;
 extern crate serialize;
 extern crate url;
 extern crate util;
@@ -25,7 +25,7 @@ pub use self::DevtoolScriptControlMsg::*;
 pub use self::EvaluateJSReply::*;
 
 use serialize::{Decodable, Decoder};
-use servo_msg::constellation_msg::PipelineId;
+use msg::constellation_msg::PipelineId;
 use util::str::DOMString;
 use url::Url;
 

servo/components/gfx/display_list/mod.rs

@@ -30,7 +30,7 @@ use geom::{Point2D, Rect, SideOffsets2D, Size2D, Matrix2D};
 use geom::num::Zero;
 use libc::uintptr_t;
 use paint_task::PaintLayer;
-use servo_msg::compositor_msg::LayerId;
+use msg::compositor_msg::LayerId;
 use servo_net::image::base::Image;
 use util::cursor::Cursor;
 use util::dlist as servo_dlist;

servo/components/gfx/lib.rs

@@ -25,7 +25,7 @@ extern crate "plugins" as servo_plugins;
 extern crate "net" as servo_net;
 #[macro_use]
 extern crate util;
-extern crate "msg" as servo_msg;
+extern crate msg;
 extern crate style;
 extern crate skia;
 extern crate time;

servo/components/gfx/paint_task.rs

@@ -20,11 +20,11 @@ use layers::platform::surface::{NativeGraphicsMetadata, NativePaintingGraphicsCo
 use layers::platform::surface::NativeSurface;
 use layers::layers::{BufferRequest, LayerBuffer, LayerBufferSet};
 use layers;
-use servo_msg::compositor_msg::{Epoch, PaintState, LayerId};
-use servo_msg::compositor_msg::{LayerMetadata, PaintListener, ScrollPolicy};
-use servo_msg::constellation_msg::Msg as ConstellationMsg;
-use servo_msg::constellation_msg::{ConstellationChan, Failure, PipelineId};
-use servo_msg::constellation_msg::PipelineExitType;
+use msg::compositor_msg::{Epoch, PaintState, LayerId};
+use msg::compositor_msg::{LayerMetadata, PaintListener, ScrollPolicy};
+use msg::constellation_msg::Msg as ConstellationMsg;
+use msg::constellation_msg::{ConstellationChan, Failure, PipelineId};
+use msg::constellation_msg::PipelineExitType;
 use skia::SkiaGrGLNativeContextRef;
 use util::geometry::{Au, ZERO_POINT};
 use util::opts;

servo/components/layout/block.rs

@@ -51,7 +51,7 @@ use wrapper::ThreadSafeLayoutNode;
 use geom::{Point2D, Rect, Size2D};
 use gfx::display_list::{ClippingRegion, DisplayList};
 use serialize::{Encoder, Encodable};
-use servo_msg::compositor_msg::LayerId;
+use msg::compositor_msg::LayerId;
 use servo_util::geometry::{Au, MAX_AU};
 use servo_util::logical_geometry::{LogicalPoint, LogicalRect, LogicalSize};
 use servo_util::opts;

servo/components/layout/context.rs

@@ -14,7 +14,7 @@ use gfx::font_context::FontContext;
 use gfx::font_cache_task::FontCacheTask;
 use script::layout_interface::LayoutChan;
 use script_traits::UntrustedNodeAddress;
-use servo_msg::constellation_msg::ConstellationChan;
+use msg::constellation_msg::ConstellationChan;
 use servo_net::local_image_cache::LocalImageCache;
 use servo_util::geometry::Au;
 use std::cell::Cell;

servo/components/layout/display_list_builder.rs

@@ -35,9 +35,9 @@ use gfx::display_list::{StackingContext, TextDisplayItem};
 use gfx::paint_task::PaintLayer;
 use png;
 use png::PixelsByColorType;
-use servo_msg::compositor_msg::ScrollPolicy;
-use servo_msg::constellation_msg::Msg as ConstellationMsg;
-use servo_msg::constellation_msg::ConstellationChan;
+use msg::compositor_msg::ScrollPolicy;
+use msg::constellation_msg::Msg as ConstellationMsg;
+use msg::constellation_msg::ConstellationChan;
 use servo_net::image::holder::ImageHolder;
 use servo_util::cursor::Cursor;
 use servo_util::geometry::{self, Au, to_px, to_frac_px};

servo/components/layout/flow.rs

@@ -49,7 +49,7 @@ use wrapper::ThreadSafeLayoutNode;
 use geom::{Point2D, Rect, Size2D};
 use gfx::display_list::ClippingRegion;
 use serialize::{Encoder, Encodable};
-use servo_msg::compositor_msg::LayerId;
+use msg::compositor_msg::LayerId;
 use servo_util::geometry::{Au, ZERO_RECT};
 use servo_util::logical_geometry::{LogicalRect, LogicalSize, WritingMode};
 use std::mem;

servo/components/layout/fragment.rs

@@ -29,7 +29,7 @@ use gfx::text::glyph::CharIndex;
 use gfx::text::text_run::{TextRun, TextRunSlice};
 use script_traits::UntrustedNodeAddress;
 use serialize::{Encodable, Encoder};
-use servo_msg::constellation_msg::{PipelineId, SubpageId};
+use msg::constellation_msg::{PipelineId, SubpageId};
 use servo_net::image::holder::ImageHolder;
 use servo_net::local_image_cache::LocalImageCache;
 use servo_util::geometry::{self, Au, ZERO_POINT};

servo/components/layout/layout_task.rs

@@ -45,9 +45,9 @@ use script::layout_interface::{MouseOverResponse, Msg};
 use script::layout_interface::{Reflow, ReflowGoal, ScriptLayoutChan, TrustedNodeAddress};
 use script_traits::{ConstellationControlMsg, CompositorEvent, OpaqueScriptLayoutChannel};
 use script_traits::{ScriptControlChan, UntrustedNodeAddress};
-use servo_msg::compositor_msg::ScrollPolicy;
-use servo_msg::constellation_msg::Msg as ConstellationMsg;
-use servo_msg::constellation_msg::{ConstellationChan, Failure, PipelineExitType, PipelineId};
+use msg::compositor_msg::ScrollPolicy;
+use msg::constellation_msg::Msg as ConstellationMsg;
+use msg::constellation_msg::{ConstellationChan, Failure, PipelineExitType, PipelineId};
 use servo_net::image_cache_task::{ImageCacheTask, ImageResponseMsg};
 use servo_net::local_image_cache::{ImageResponder, LocalImageCache};
 use servo_net::resource_task::{ResourceTask, load_bytes_iter};

servo/components/layout/lib.rs

@@ -27,7 +27,7 @@ extern crate style;
 #[no_link] #[plugin]
 extern crate "plugins" as servo_plugins;
 extern crate "net" as servo_net;
-extern crate "msg" as servo_msg;
+extern crate msg;
 #[macro_use]
 extern crate "util" as servo_util;
 

servo/components/layout/wrapper.rs

@@ -59,7 +59,7 @@ use script::dom::node::{LayoutNodeHelpers, RawLayoutNodeHelpers, SharedLayoutDat
 use script::dom::node::{HAS_CHANGED, IS_DIRTY, HAS_DIRTY_SIBLINGS, HAS_DIRTY_DESCENDANTS};
 use script::dom::text::Text;
 use script::layout_interface::LayoutChan;
-use servo_msg::constellation_msg::{PipelineId, SubpageId};
+use msg::constellation_msg::{PipelineId, SubpageId};
 use servo_util::str::{LengthOrPercentageOrAuto, is_whitespace};
 use std::borrow::ToOwned;
 use std::cell::{Ref, RefMut};

servo/components/layout_traits/lib.rs

@@ -6,7 +6,7 @@
 
 extern crate gfx;
 extern crate script_traits;
-extern crate "msg" as servo_msg;
+extern crate msg;
 extern crate "net" as servo_net;
 extern crate util;
 
@@ -17,7 +17,7 @@ extern crate util;
 
 use gfx::font_cache_task::FontCacheTask;
 use gfx::paint_task::PaintChan;
-use servo_msg::constellation_msg::{ConstellationChan, Failure, PipelineId, PipelineExitType};
+use msg::constellation_msg::{ConstellationChan, Failure, PipelineId, PipelineExitType};
 use servo_net::image_cache_task::ImageCacheTask;
 use servo_net::resource_task::ResourceTask;
 use util::time::TimeProfilerChan;

servo/components/script/devtools.rs

@@ -16,7 +16,7 @@ use dom::window::{ScriptHelpers};
 use dom::element::Element;
 use dom::document::DocumentHelpers;
 use page::Page;
-use servo_msg::constellation_msg::PipelineId;
+use msg::constellation_msg::PipelineId;
 use script_task::get_page;
 
 use std::sync::mpsc::Sender;

servo/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};

servo/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;

servo/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;
 

servo/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;

servo/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};

servo/components/script/layout_interface.rs

@@ -11,7 +11,7 @@ use dom::node::LayoutDataRef;
 use geom::point::Point2D;
 use geom::rect::Rect;
 use script_traits::{ScriptControlChan, OpaqueScriptLayoutChannel, UntrustedNodeAddress};
-use servo_msg::constellation_msg::{PipelineExitType, WindowSizeData};
+use msg::constellation_msg::{PipelineExitType, WindowSizeData};
 use util::geometry::Au;
 use std::any::Any;
 use std::sync::mpsc::{channel, Receiver, Sender};

servo/components/script/lib.rs

@@ -36,7 +36,6 @@ extern crate "net" as servo_net;
 extern crate util;
 #[macro_use]
 extern crate style;
-extern crate "msg" as servo_msg;
 extern crate url;
 extern crate uuid;
 extern crate string_cache;

servo/components/script/page.rs

@@ -22,9 +22,9 @@ use script_traits::{UntrustedNodeAddress, ScriptControlChan};
 
 use geom::{Point2D, Rect, Size2D};
 use js::rust::Cx;
-use servo_msg::compositor_msg::ScriptListener;
-use servo_msg::constellation_msg::{ConstellationChan, WindowSizeData};
-use servo_msg::constellation_msg::{PipelineId, SubpageId};
+use msg::compositor_msg::ScriptListener;
+use msg::constellation_msg::{ConstellationChan, WindowSizeData};
+use msg::constellation_msg::{PipelineId, SubpageId};
 use servo_net::resource_task::ResourceTask;
 use servo_net::storage_task::StorageTask;
 use util::geometry::{Au, MAX_RECT};

servo/components/script/script_task.rs

@@ -51,14 +51,14 @@ use script_traits::CompositorEvent::{MouseMoveEvent, KeyEvent};
 use script_traits::{NewLayoutInfo, OpaqueScriptLayoutChannel};
 use script_traits::{ConstellationControlMsg, ScriptControlChan};
 use script_traits::ScriptTaskFactory;
-use servo_msg::compositor_msg::ReadyState::{FinishedLoading, Loading, PerformingLayout};
-use servo_msg::compositor_msg::{LayerId, ScriptListener};
-use servo_msg::constellation_msg::{ConstellationChan};
-use servo_msg::constellation_msg::{LoadData, NavigationDirection, PipelineId, SubpageId};
-use servo_msg::constellation_msg::{Failure, Msg, WindowSizeData, Key, KeyState};
-use servo_msg::constellation_msg::{KeyModifiers, SUPER, SHIFT, CONTROL, ALT};
-use servo_msg::constellation_msg::{PipelineExitType};
-use servo_msg::constellation_msg::Msg as ConstellationMsg;
+use msg::compositor_msg::ReadyState::{FinishedLoading, Loading, PerformingLayout};
+use msg::compositor_msg::{LayerId, ScriptListener};
+use msg::constellation_msg::{ConstellationChan};
+use msg::constellation_msg::{LoadData, NavigationDirection, PipelineId, SubpageId};
+use msg::constellation_msg::{Failure, Msg, WindowSizeData, Key, KeyState};
+use msg::constellation_msg::{KeyModifiers, SUPER, SHIFT, CONTROL, ALT};
+use msg::constellation_msg::{PipelineExitType};
+use msg::constellation_msg::Msg as ConstellationMsg;
 use servo_net::image_cache_task::ImageCacheTask;
 use servo_net::resource_task::{ResourceTask, ControlMsg};
 use servo_net::resource_task::LoadData as NetLoadData;

servo/components/script_traits/lib.rs

@@ -10,7 +10,7 @@
 extern crate devtools_traits;
 extern crate geom;
 extern crate libc;
-extern crate "msg" as servo_msg;
+extern crate msg;
 extern crate "net" as servo_net;
 extern crate util;
 extern crate url;
@@ -23,10 +23,10 @@ extern crate serialize;
 
 use devtools_traits::DevtoolsControlChan;
 use libc::c_void;
-use servo_msg::constellation_msg::{ConstellationChan, PipelineId, Failure, WindowSizeData};
-use servo_msg::constellation_msg::{LoadData, SubpageId, Key, KeyState, KeyModifiers};
-use servo_msg::constellation_msg::PipelineExitType;
-use servo_msg::compositor_msg::ScriptListener;
+use msg::constellation_msg::{ConstellationChan, PipelineId, Failure, WindowSizeData};
+use msg::constellation_msg::{LoadData, SubpageId, Key, KeyState, KeyModifiers};
+use msg::constellation_msg::PipelineExitType;
+use msg::compositor_msg::ScriptListener;
 use servo_net::image_cache_task::ImageCacheTask;
 use servo_net::resource_task::ResourceTask;
 use servo_net::storage_task::StorageTask;

servo/components/servo/lib.rs

@@ -13,7 +13,7 @@ extern crate log;
 extern crate compositing;
 extern crate devtools;
 extern crate "net" as servo_net;
-extern crate "msg" as servo_msg;
+extern crate msg;
 #[macro_use]
 extern crate util;
 extern crate script;
@@ -28,9 +28,9 @@ use compositing::windowing::{WindowEvent, WindowMethods};
 #[cfg(not(test))]
 use compositing::{CompositorProxy, CompositorTask, Constellation};
 #[cfg(not(test))]
-use servo_msg::constellation_msg::Msg as ConstellationMsg;
+use msg::constellation_msg::Msg as ConstellationMsg;
 #[cfg(not(test))]
-use servo_msg::constellation_msg::ConstellationChan;
+use msg::constellation_msg::ConstellationChan;
 #[cfg(not(test))]
 use script::dom::bindings::codegen::RegisterBindings;
 

servo/ports/cef/browser_host.rs

@@ -12,7 +12,7 @@ use compositing::windowing::{WindowEvent, MouseWindowEvent};
 use geom::point::TypedPoint2D;
 use geom::size::TypedSize2D;
 use libc::{c_double, c_int};
-use servo_msg::constellation_msg::{self, KeyModifiers, KeyState};
+use msg::constellation_msg::{self, KeyModifiers, KeyState};
 use std::cell::RefCell;
 
 pub struct ServoCefBrowserHost {

servo/ports/cef/lib.rs

@@ -25,7 +25,7 @@ extern crate png;
 extern crate script;
 
 extern crate "net" as servo_net;
-extern crate "msg" as servo_msg;
+extern crate msg;
 extern crate util;
 extern crate style;
 extern crate stb_image;

servo/ports/cef/window.rs

@@ -21,9 +21,9 @@ use gleam::gl;
 use layers::geometry::DevicePixel;
 use layers::platform::surface::NativeGraphicsMetadata;
 use libc::{c_char, c_void};
-use servo_msg::constellation_msg::{Key, KeyModifiers};
-use servo_msg::compositor_msg::{ReadyState, PaintState};
-use servo_msg::constellation_msg::LoadData;
+use msg::constellation_msg::{Key, KeyModifiers};
+use msg::compositor_msg::{ReadyState, PaintState};
+use msg::constellation_msg::LoadData;
 use util::cursor::Cursor;
 use util::geometry::ScreenPx;
 use std::cell::RefCell;

servo/ports/gonk/src/lib.rs

@@ -12,7 +12,7 @@ extern crate log;
 extern crate compositing;
 extern crate devtools;
 extern crate "net" as servo_net;
-extern crate "msg" as servo_msg;
+extern crate msg;
 #[macro_use]
 extern crate util;
 extern crate script;
@@ -27,9 +27,9 @@ use compositing::windowing::{WindowEvent, WindowMethods};
 #[cfg(not(test))]
 use compositing::{CompositorProxy, CompositorTask, Constellation};
 #[cfg(not(test))]
-use servo_msg::constellation_msg::Msg as ConstellationMsg;
+use msg::constellation_msg::Msg as ConstellationMsg;
 #[cfg(not(test))]
-use servo_msg::constellation_msg::ConstellationChan;
+use msg::constellation_msg::ConstellationChan;
 #[cfg(not(test))]
 use script::dom::bindings::codegen::RegisterBindings;