1 files changed, 6 insertions, 6 deletions
diff --git a/components/canvas/canvas_paint_task.rs b/components/canvas/canvas_paint_task.rs
index b5cdd3be777..73941e03343 100644
--- a/components/canvas/canvas_paint_task.rs
+++ b/components/canvas/canvas_paint_task.rs
@@ -9,9 +9,9 @@ use geom::size::Size2D;
 use servo_util::task::spawn_named;
 
 use std::borrow::ToOwned;
-use std::comm;
+use std::sync::mpsc::{channel, Sender};
 
-#[deriving(Clone)]
+#[derive(Clone)]
 pub enum CanvasMsg {
     FillRect(Rect<f32>),
     ClearRect(Rect<f32>),
@@ -39,12 +39,12 @@ impl CanvasPaintTask {
     }
 
     pub fn start(size: Size2D<i32>) -> Sender<CanvasMsg> {
-        let (chan, port) = comm::channel::<CanvasMsg>();
-        spawn_named("CanvasTask".to_owned(), proc() {
+        let (chan, port) = channel::<CanvasMsg>();
+        spawn_named("CanvasTask".to_owned(), move || {
             let mut painter = CanvasPaintTask::new(size);
 
             loop {
-                match port.recv() {
+                match port.recv().unwrap() {
                     CanvasMsg::FillRect(ref rect) => painter.fill_rect(rect),
                     CanvasMsg::StrokeRect(ref rect) => painter.stroke_rect(rect),
                     CanvasMsg::ClearRect(ref rect) => painter.clear_rect(rect),
@@ -81,7 +81,7 @@ impl CanvasPaintTask {
 
     fn send_pixel_contents(&mut self, chan: Sender<Vec<u8>>) {
         self.drawtarget.snapshot().get_data_surface().with_data(|element| {
-            chan.send(element.to_vec());
+            chan.send(element.to_vec()).unwrap();
         })
     }
 }