3 files changed, 5 insertions, 3 deletions
diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml
index 1b0e08ab92e..efa63206c4b 100644
--- a/components/layout/Cargo.toml
+++ b/components/layout/Cargo.toml
@@ -22,7 +22,7 @@ fxhash = "0.2"
 gfx = {path = "../gfx"}
 gfx_traits = {path = "../gfx_traits"}
 html5ever = "0.22"
-ipc-channel = "0.10"
+ipc-channel = "0.11"
 libc = "0.2"
 log = "0.4"
 malloc_size_of = { path = "../malloc_size_of" }
@@ -39,6 +39,7 @@ selectors = { path = "../selectors" }
 serde = "1.0"
 servo_arc = {path = "../servo_arc"}
 servo_atoms = {path = "../atoms"}
+servo_channel = {path = "../channel"}
 servo_geometry = {path = "../geometry"}
 serde_json = "1.0"
 servo_config = {path = "../config"}
diff --git a/components/layout/animation.rs b/components/layout/animation.rs
index d8b305644c0..b42933bb400 100644
--- a/components/layout/animation.rs
+++ b/components/layout/animation.rs
@@ -13,7 +13,7 @@ use msg::constellation_msg::PipelineId;
 use opaque_node::OpaqueNodeMethods;
 use script_traits::{AnimationState, ConstellationControlMsg, LayoutMsg as ConstellationMsg};
 use script_traits::UntrustedNodeAddress;
-use std::sync::mpsc::Receiver;
+use servo_channel::Receiver;
 use style::animation::{Animation, update_style_for_animation};
 use style::dom::TElement;
 use style::font_metrics::ServoMetricsProvider;
@@ -36,7 +36,7 @@ pub fn update_animation_state<E>(
     E: TElement,
 {
     let mut new_running_animations = vec![];
-    while let Ok(animation) = new_animations_receiver.try_recv() {
+    while let Some(animation) = new_animations_receiver.try_recv() {
         let mut should_push = true;
         if let Animation::Keyframes(ref node, _, ref name, ref state) = animation {
             // If the animation was already present in the list for the
diff --git a/components/layout/lib.rs b/components/layout/lib.rs
index ce47eb72620..3dc289a11fa 100644
--- a/components/layout/lib.rs
+++ b/components/layout/lib.rs
@@ -36,6 +36,7 @@ extern crate serde;
 extern crate serde_json;
 extern crate servo_arc;
 extern crate servo_atoms;
+extern crate servo_channel;
 extern crate servo_config;
 extern crate servo_geometry;
 extern crate servo_url;