From 9026bd1f00257c468c272f3f717b7fe95591a7d9 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Thu, 14 Jun 2012 15:06:42 -0700
Subject: [PATCH] engine::msg -> Msg

---
 src/rust-geom       |  2 +-
 src/servo/engine.rs | 20 +++++++++++---------
 src/servo/servo.rs  | 12 ++++++------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/rust-geom b/src/rust-geom
index 2aab07f798f..5141a7ff6c2 160000
--- a/src/rust-geom
+++ b/src/rust-geom
@@ -1 +1 @@
-Subproject commit 2aab07f798ffbd783ff48c9312b28576022eded3
+Subproject commit 5141a7ff6c225f8265eecff496988efcbe41004b
diff --git a/src/servo/engine.rs b/src/servo/engine.rs
index decf05fffa6..a451bc41c97 100644
--- a/src/servo/engine.rs
+++ b/src/servo/engine.rs
@@ -1,13 +1,13 @@
+import comm::chan;
 import gfx::renderer;
 
-enum msg {
-    load_url(~str),
-    exit(comm::chan<()>)
+enum Msg {
+    LoadURLMsg(~str),
+    ExitMsg(comm::chan<()>)
 }
 
-fn engine<S: renderer::sink send copy>(sink: S) -> comm::chan<msg> {
-
-    task::spawn_listener::<msg> {|self_ch|
+fn engine<S:renderer::sink send copy>(sink: S) -> chan<Msg> {
+    task::spawn_listener::<Msg> {|self_ch|
         // The renderer
         let renderer = renderer::renderer(sink);
 
@@ -19,7 +19,7 @@ fn engine<S: renderer::sink send copy>(sink: S) -> comm::chan<msg> {
 
         loop {
             alt self_ch.recv() {
-              load_url(url) {
+              LoadURLMsg(url) {
                 let url <- url;
                 if (*url).ends_with(".js") {
                     content.send(content::execute(url))
@@ -27,10 +27,12 @@ fn engine<S: renderer::sink send copy>(sink: S) -> comm::chan<msg> {
                     content.send(content::parse(url))
                 }
               }
-              exit(sender) {
+
+              ExitMsg(sender) {
                 content.send(content::exit);
                 layout.send(layout::layout_task::exit);
-                listen {|resp_ch|
+                listen {
+                    |resp_ch|
                     renderer.send(renderer::exit(resp_ch));
                     resp_ch.recv();
                 }
diff --git a/src/servo/servo.rs b/src/servo/servo.rs
index b671176e7d7..fffba519bf9 100644
--- a/src/servo/servo.rs
+++ b/src/servo/servo.rs
@@ -41,7 +41,7 @@ fn run_pipeline_screen(urls: [str]) {
 
         for urls.each { |filename|
             #debug["master: Sending filename `%s`", filename];
-            engine.send(engine::load_url(~copy filename));
+            engine.send(engine::LoadURLMsg(~copy filename));
             #debug["master: Waiting for keypress"];
             key_ch.recv();
         }
@@ -50,7 +50,7 @@ fn run_pipeline_screen(urls: [str]) {
     // Shut everything down
     #debug["master: Shut down"];
     listen {|resp_ch|
-        engine.send(engine::exit(resp_ch));
+        engine.send(engine::ExitMsg(resp_ch));
         resp_ch.recv();
     }
     osmain.send(platform::osmain::exit);
@@ -66,7 +66,7 @@ fn run_pipeline_png(-url: str, outfile: str) {
         let sink = pngsink::pngsink(pngdata);
         let engine = engine::engine(sink);
         let url <- url;
-        engine.send(engine::load_url(~url));
+        engine.send(engine::LoadURLMsg(~url));
         alt io::buffered_file_writer(outfile) {
           result::ok(writer) {
             import io::writer;
@@ -74,9 +74,9 @@ fn run_pipeline_png(-url: str, outfile: str) {
           }
           result::err(e) { fail e }
         }
-        listen {|resp_ch|
-            engine.send(engine::exit(resp_ch));
-            resp_ch.recv();
+        listen {|response_channel|
+            engine.send(engine::ExitMsg(response_channel));
+            response_channel.recv();
         }
         sink.send(pngsink::exit);
     }