From ca217b4f756dfbd677e98318edb60f5f4f8606f0 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Thu, 15 Nov 2012 17:34:18 -0800
Subject: [PATCH] css, gfx, layout, submodules: Update for compiler bugfixes

---
 src/rust-css                   | 2 +-
 src/servo-gfx/font.rs          | 7 ++++++-
 src/servo/css/node_void_ptr.rs | 2 +-
 src/servo/layout/inline.rs     | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/rust-css b/src/rust-css
index 3bbe4ed4fc3..55ef54e4bb4 160000
--- a/src/rust-css
+++ b/src/rust-css
@@ -1 +1 @@
-Subproject commit 3bbe4ed4fc3d642e1e651ff3d8123c9dca626c22
+Subproject commit 55ef54e4bb4f2a69f80827d899a739f322ab323e
diff --git a/src/servo-gfx/font.rs b/src/servo-gfx/font.rs
index 8300e74d556..3a6e68b67d9 100644
--- a/src/servo-gfx/font.rs
+++ b/src/servo-gfx/font.rs
@@ -107,7 +107,12 @@ enum CSSFontWeight {
     FontWeight800,
     FontWeight900,
 }
-pub impl CSSFontWeight : cmp::Eq;
+pub impl CSSFontWeight : cmp::Eq {
+    pure fn eq(other: &CSSFontWeight) -> bool {
+        (self as uint) == (*other as uint)
+    }
+    pure fn ne(other: &CSSFontWeight) -> bool { !self.eq(other) }
+}
 
 pub impl CSSFontWeight {
     pub pure fn is_bold() -> bool {
diff --git a/src/servo/css/node_void_ptr.rs b/src/servo/css/node_void_ptr.rs
index 24cd8f7d97d..e5d57797e12 100644
--- a/src/servo/css/node_void_ptr.rs
+++ b/src/servo/css/node_void_ptr.rs
@@ -4,7 +4,7 @@ use dom::node::Node;
 
 // FIXME: Rust #3908. rust-css can't reexport VoidPtrLike
 extern mod netsurfcss;
-use netsurfcss::VoidPtrLike;
+use netsurfcss::util::VoidPtrLike;
 
 impl Node: VoidPtrLike {
     static fn from_void_ptr(node: *libc::c_void) -> Node {
diff --git a/src/servo/layout/inline.rs b/src/servo/layout/inline.rs
index 43c2502ff15..84a1d109c1d 100644
--- a/src/servo/layout/inline.rs
+++ b/src/servo/layout/inline.rs
@@ -13,7 +13,7 @@ use gfx::font::FontStyle;
 use gfx::geometry::Au;
 use gfx::text::util::*;
 use gfx::util::range::{MutableRange, Range};
-use newcss::values::{BoxAuto, BoxLength, Px};
+use newcss::units::{BoxAuto, BoxLength, Px};
 use std::arc;
 
 /*