Upgrade to rustc 0.8-pre (0ac3e02 2013-08-30 05:45:45 -0700)

src/compiler/rust

@@ -1 +1 @@
-Subproject commit c822d1070ac39871165df30ac8d09e733a6e7fb9
+Subproject commit 0ac3e023d86fa84ed38bca3d34003b494fd28acf

src/components/gfx/text/shaping/harfbuzz.rs

@@ -86,8 +86,8 @@ impl ShapedGlyphData {
     fn byte_offset_of_glyph(&self, i: uint) -> uint {
         assert!(i < self.count);
 
-        let glyph_info_i = ptr::offset(self.glyph_infos, i as int);
         unsafe {
+            let glyph_info_i = ptr::offset(self.glyph_infos, i as int);
             (*glyph_info_i).cluster as uint
         }
     }

src/components/main/layout/layout_task.rs

@@ -307,7 +307,7 @@ impl LayoutTask {
                     ctx: &layout_ctx,
                 };
 
-                let display_list = ~Cell::new(DisplayList::new::<AbstractNode<()>>());
+                let display_list = ~Cell::new(DisplayList::<AbstractNode<()>>::new());
 
                 // TODO: Set options on the builder before building.
                 // TODO: Be smarter about what needs painting.

src/components/script/dom/bindings/codegen/CodegenRust.py

@@ -1247,10 +1247,10 @@ for (uint32_t i = 0; i < length; ++i) {
         dataLoc = "${declName}"
         #XXXjdm conversionBehavior should be used
         template = (
-            "match JSValConvertible::from_jsval::<%s>(${val}) {\n"
+            "match JSValConvertible::from_jsval(${val}) {\n"
             "  None => return 0,\n"
             "  Some(v) => %s = v\n"
-            "}" % (typeName, dataLoc))
+            "}" % (dataLoc,))
         declType = CGGeneric(typeName)
     if (defaultValue is not None and
         # We already handled IDLNullValue, so just deal with the other ones

src/components/util/tree.rs

@@ -9,13 +9,19 @@
 // and use its default methods.
 macro_rules! get(
     ($node:expr, $fun:ident) => (
-        TreeNodeRef::$fun::<Node,Self>($node)
+        {
+            let val: Option<Self> = TreeNodeRef::<Node>::$fun($node);
+            val
+        }
     )
 )
 
 macro_rules! set(
     ($node:expr, $fun:ident, $val:expr) => (
-        TreeNodeRef::$fun::<Node,Self>($node, $val)
+        {
+            let val: Option<Self> = $val;
+            TreeNodeRef::<Node>::$fun($node, val)
+        }
     )
 )
 
@@ -31,7 +37,7 @@ impl<Node, Ref: TreeNodeRef<Node>> Iterator<Ref> for ChildIterator<Ref> {
 
         // FIXME: Do we need two clones here?
         let x = self.current.get_ref().clone();
-        self.current = x.with_base(|n| TreeNodeRef::next_sibling::<Node, Ref>(n));
+        self.current = x.with_base(|n| TreeNodeRef::<Node>::next_sibling(n));
         Some(x.clone())
     }
 }
@@ -246,51 +252,51 @@ fn gather<Node, Ref: TreeNodeRef<Node>>(cur: &Ref, refs: &mut ~[Ref],
 pub trait TreeNode<Ref: TreeNodeRef<Self>> {
     /// Returns the parent of this node.
     fn parent_node(&self) -> Option<Ref> {
-        TreeNodeRef::parent_node::<Self,Ref>(self)
+        TreeNodeRef::<Self>::parent_node(self)
     }
 
     /// Returns the first child of this node.
     fn first_child(&self) -> Option<Ref> {
-        TreeNodeRef::first_child::<Self,Ref>(self)
+        TreeNodeRef::<Self>::first_child(self)
     }
 
     /// Returns the last child of this node.
     fn last_child(&self) -> Option<Ref> {
-        TreeNodeRef::last_child::<Self,Ref>(self)
+        TreeNodeRef::<Self>::last_child(self)
     }
 
     /// Returns the previous sibling of this node.
     fn prev_sibling(&self) -> Option<Ref> {
-        TreeNodeRef::prev_sibling::<Self,Ref>(self)
+        TreeNodeRef::<Self>::prev_sibling(self)
     }
 
     /// Returns the next sibling of this node.
     fn next_sibling(&self) -> Option<Ref> {
-        TreeNodeRef::next_sibling::<Self,Ref>(self)
+        TreeNodeRef::<Self>::next_sibling(self)
     }
 
     /// Sets the parent of this node.
     fn set_parent_node(&mut self, new_parent: Option<Ref>) {
-        TreeNodeRef::set_parent_node::<Self,Ref>(self, new_parent)
+        TreeNodeRef::<Self>::set_parent_node(self, new_parent)
     }
 
     /// Sets the first child of this node.
     fn set_first_child(&mut self, new_first_child: Option<Ref>) {
-        TreeNodeRef::set_first_child::<Self,Ref>(self, new_first_child)
+        TreeNodeRef::<Self>::set_first_child(self, new_first_child)
     }
 
     /// Sets the last child of this node.
     fn set_last_child(&mut self, new_last_child: Option<Ref>) {
-        TreeNodeRef::set_last_child::<Self,Ref>(self, new_last_child)
+        TreeNodeRef::<Self>::set_last_child(self, new_last_child)
     }
 
     /// Sets the previous sibling of this node.
     fn set_prev_sibling(&mut self, new_prev_sibling: Option<Ref>) {
-        TreeNodeRef::set_prev_sibling::<Self,Ref>(self, new_prev_sibling)
+        TreeNodeRef::<Self>::set_prev_sibling(self, new_prev_sibling)
     }
 
     /// Sets the next sibling of this node.
     fn set_next_sibling(&mut self, new_next_sibling: Option<Ref>) {
-        TreeNodeRef::set_next_sibling::<Self,Ref>(self, new_next_sibling)
+        TreeNodeRef::<Self>::set_next_sibling(self, new_next_sibling)
     }
 }

src/platform/macos/rust-core-foundation

@@ -1 +1 @@
-Subproject commit 9755a007a0294294740d728ba14de30b45b769e5
+Subproject commit 95f2f30981e12128e1dab0956f11c70386d85bfc

src/platform/macos/rust-core-graphics

@@ -1 +1 @@
-Subproject commit 4c4662a5d6077b547466d33c9a00cb33df9f6f26
+Subproject commit adb526a6ca8deee37152ef3ba1197894286e2204

src/platform/macos/rust-core-text

@@ -1 +1 @@
-Subproject commit 36b060d0aef4b3d3f644ef221a0aaca4cd31bcdb
+Subproject commit 129e99ff088fad6ea8f3187680c15a0a3e2cc403

src/platform/macos/rust-io-surface

@@ -1 +1 @@
-Subproject commit e775ce635a063bf1d5d6b5b0c5339cbb818116ab
+Subproject commit d685aad6f6ab3559c8de5ca76520b8f1e0e21b64

src/support/netsurfcss/rust-netsurfcss

@@ -1 +1 @@
-Subproject commit 0793c920f33c5928323358f7aba7da3253019c60
+Subproject commit f69e26f4d97316063b6c20f0c71d7568d8d42a76

src/support/spidermonkey/rust-mozjs

@@ -1 +1 @@
-Subproject commit d951d00382c7ad95d64b87f876188df7f0254f00
+Subproject commit b7121da7fcb5eba84b563118db49a43279c88ee9