From a6d9b123e4fc5b5de2d9f10199dc6ef62402eb0d Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Sun, 24 Jun 2012 14:26:23 -0700
Subject: [PATCH] Update for latest language changes

---
 src/rust-mozjs                | 2 +-
 src/servo/gfx/pngsink.rs      | 2 +-
 src/servo/net.rs              | 2 +-
 src/servo/parser/css_lexer.rs | 2 +-
 src/servo/servo.rs            | 1 -
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/rust-mozjs b/src/rust-mozjs
index 530d8661e52..b6276a4cf5a 160000
--- a/src/rust-mozjs
+++ b/src/rust-mozjs
@@ -1 +1 @@
-Subproject commit 530d8661e5282180acd2c3005f4fe7f0c2477f0a
+Subproject commit b6276a4cf5a96e2d687eafd626111d51d3ea815b
diff --git a/src/servo/gfx/pngsink.rs b/src/servo/gfx/pngsink.rs
index cb6538fc5fb..bf2b3e99ab7 100644
--- a/src/servo/gfx/pngsink.rs
+++ b/src/servo/gfx/pngsink.rs
@@ -76,7 +76,7 @@ fn do_draw(sender: chan<AzDrawTargetRef>,
            output: chan<[u8]>,
            cairo_surf: *cairo_surface_t) {
 
-    listen {|data_ch|
+    listen {|data_ch: chan<[u8]>|
 
         crust fn write_fn(closure: *c_void,
                           data: *c_uchar,
diff --git a/src/servo/net.rs b/src/servo/net.rs
index 39d73a4b075..37d62e62c93 100644
--- a/src/servo/net.rs
+++ b/src/servo/net.rs
@@ -17,7 +17,7 @@ iface io_service {
     fn new_channel(uri: uri) -> channel;
 }
 
-class file_channel implements channel {
+class file_channel: channel {
     let bogus : int;
 
     new() {
diff --git a/src/servo/parser/css_lexer.rs b/src/servo/parser/css_lexer.rs
index bc0e5c3ed12..6ce3f762f46 100644
--- a/src/servo/parser/css_lexer.rs
+++ b/src/servo/parser/css_lexer.rs
@@ -230,7 +230,7 @@ fn spawn_css_lexer_task(-filename: ~str) -> port<Token> {
         // otherwise just send an eof.  This is a hack to allow
         // guessing that if foo.html exists, foo.css is the
         // corresponding stylesheet.
-        if file_try.is_success() {
+        if file_try.is_ok() {
             #debug["Lexing css sheet %s", *copy filename];
             let file_data = file_try.get();
             let reader = io::bytes_reader(file_data);
diff --git a/src/servo/servo.rs b/src/servo/servo.rs
index 1e12780e7f3..57ef23abba7 100644
--- a/src/servo/servo.rs
+++ b/src/servo/servo.rs
@@ -1,5 +1,4 @@
 import comm::*;
-import result::extensions;
 import gfx::renderer;
 import platform::osmain;
 import osmain::{OSMain, AddKeyHandler};