servo: Update for language changes

src/rust-http-client

@@ -1 +1 @@
-Subproject commit bbf4b170fd4b2b90d73f0187aa330a14e4c2a043
+Subproject commit db00f7d1feb0ff2ad2989d98ff152702d4638c04

src/rust-hubbub

@@ -1 +1 @@
-Subproject commit b47a97ba3bb7944cef026ad7e740c34899271b86
+Subproject commit f0aebb8ba525cd39227e1fe0ca8c2119ddac3f29

src/rust-netsurfcss

@@ -1 +1 @@
-Subproject commit 2925080706fbf9e600ce96e751ea74e367034712
+Subproject commit 5cde7b87ad4168a13d89077b2670c0e156cf4b0a

src/servo-gfx/geometry.rs

@@ -6,14 +6,14 @@ use num::{Num, from_int};
 pub enum Au = i32;
 
 impl Au : Num {
-    pure fn add(other: &Au) -> Au        { Au(*self + **other) }
-    pure fn sub(other: &Au) -> Au        { Au(*self - **other) }
-    pure fn mul(other: &Au) -> Au        { Au(*self * **other) }
-    pure fn div(other: &Au) -> Au        { Au(*self / **other) }
-    pure fn modulo(other: &Au) -> Au     { Au(*self % **other) }
-    pure fn neg() -> Au                   { Au(-*self)         }
+    pure fn add(&self, other: &Au) -> Au    { Au(**self + **other) }
+    pure fn sub(&self, other: &Au) -> Au    { Au(**self - **other) }
+    pure fn mul(&self, other: &Au) -> Au    { Au(**self * **other) }
+    pure fn div(&self, other: &Au) -> Au    { Au(**self / **other) }
+    pure fn modulo(&self, other: &Au) -> Au { Au(**self % **other) }
+    pure fn neg(&self) -> Au                { Au(-**self)         }
 
-    pure fn to_int() -> int               { *self as int       }
+    pure fn to_int(&self) -> int            { **self as int       }
 
     static pure fn from_int(n: int) -> Au {
         Au((n & (i32::max_value as int)) as i32)

src/servo-gfx/resource/image_cache_task.rs

@@ -323,7 +323,7 @@ impl ImageCache {
                 let data = data_cell.take();
                 let to_cache = self.chan.clone();
                 let url_cell = Cell(copy url);
-                let decode = self.decoder_factory();
+                let decode = (self.decoder_factory)();
 
                 do spawn |move url_cell, move decode, move data, move to_cache| {
                     let url = url_cell.take();

src/servo/layout/box.rs

@@ -147,13 +147,13 @@ impl RenderBox  {
     }
 
     fn can_merge_with_box(@self, other: @RenderBox) -> bool {
-        assert !core::box::ptr_eq(self, other);
+        assert !core::managed::ptr_eq(self, other);
 
         match (self, other) {
             (@UnscannedTextBox(*), @UnscannedTextBox(*)) => {
                 self.font_style() == other.font_style()
             },
-            (@TextBox(_,d1), @TextBox(_,d2)) => { core::box::ptr_eq(d1.run, d2.run) }
+            (@TextBox(_,d1), @TextBox(_,d2)) => core::managed::ptr_eq(d1.run, d2.run),
             (_, _) => false
         }
     }

src/servo/layout/flow.rs

@@ -224,7 +224,7 @@ impl FlowTree {
 
 impl FlowTree : tree::WriteMethods<@FlowContext> {
 
-    pure fn eq(a: &@FlowContext, b: &@FlowContext) -> bool { core::box::ptr_eq(*a, *b) }
+    pure fn eq(a: &@FlowContext, b: &@FlowContext) -> bool { core::managed::ptr_eq(*a, *b) }
 
     fn with_tree_fields<R>(box: &@FlowContext, f: fn(&tree::Tree<@FlowContext>) -> R) -> R {
         f(&box.d().tree)