servo: Update to Rust 754704ea9442ce92602f8022f6c979824b016842

1 files changed, 13 insertions, 14 deletions

diff --git a/src/servo/engine.rs b/src/servo/engine.rs
index 2bc9a7f2542..e3ced2b35bb 100644
--- a/src/servo/engine.rs
+++ b/src/servo/engine.rs
@@ -38,10 +38,11 @@ fn Engine<C:Compositor Send Copy>(compositor: C,
                                   resource_task: ResourceTask,
                                   image_cache_task: ImageCacheTask) -> EngineTask {
 
-    let dom_event_port = Cell(dom_event_port);
-    let dom_event_chan = Cell(dom_event_chan);
+    let dom_event_port = Cell(move dom_event_port);
+    let dom_event_chan = Cell(move dom_event_chan);
 
-    do spawn_listener::<Msg> |request, move dom_event_port, move dom_event_chan| {
+    do spawn_listener::<Msg> |request, move dom_event_port, move dom_event_chan,
+                              move image_cache_task| {
         let render_task = RenderTask(compositor);
         let layout_task = LayoutTask(render_task, image_cache_task.clone());
         let content_task = ContentTask(layout_task,
@@ -53,9 +54,9 @@ fn Engine<C:Compositor Send Copy>(compositor: C,
             compositor: compositor,
             render_task: render_task,
             resource_task: resource_task,
-            image_cache_task: image_cache_task,
-            layout_task: layout_task,
-            content_task: content_task
+            image_cache_task: image_cache_task.clone(),
+            layout_task: move layout_task,
+            content_task: move content_task
         }.run();
     }
 }
@@ -68,25 +69,23 @@ impl<C: Compositor Copy Send> Engine<C> {
     }
 
     fn handle_request(request: Msg) -> bool {
-        match request {
-          LoadURLMsg(url) => {
-            // TODO: change copy to move once we have match move
-            let url = copy url;
+        match move request {
+          LoadURLMsg(move url) => {
             if url.path.ends_with(".js") {
-                self.content_task.send(ExecuteMsg(url))
+                self.content_task.send(ExecuteMsg(move url))
             } else {
-                self.content_task.send(ParseMsg(url))
+                self.content_task.send(ParseMsg(move url))
             }
             return true;
           }
 
-          ExitMsg(sender) => {
+          ExitMsg(move sender) => {
             self.content_task.send(content_task::ExitMsg);
             self.layout_task.send(layout_task::ExitMsg);
             
             let (response_chan, response_port) = pipes::stream();
 
-            self.render_task.send(render_task::ExitMsg(response_chan));
+            self.render_task.send(render_task::ExitMsg(move response_chan));
             response_port.recv();
 
             self.image_cache_task.exit();