diff --git a/src/rust-geom b/src/rust-geom
index 27bde1d4975..32fef0a3520 160000
--- a/src/rust-geom
+++ b/src/rust-geom
@@ -1 +1 @@
-Subproject commit 27bde1d49759768eb7c8e0ac328c3286e0f0cdde
+Subproject commit 32fef0a352053f84488d1fd8737d8311714173dd
diff --git a/src/servo/dom/bindings/utils.rs b/src/servo/dom/bindings/utils.rs
index eeeac86b8ee..e56b8440f4d 100644
--- a/src/servo/dom/bindings/utils.rs
+++ b/src/servo/dom/bindings/utils.rs
@@ -13,7 +13,7 @@ enum DOMString {
     null_string
 }
 
-type rust_box<T> = {rc: uint, td: *sys::type_desc, next: *(), prev: *(), payload: T};
+type rust_box<T> = {rc: uint, td: *sys::TypeDesc, next: *(), prev: *(), payload: T};
 
 unsafe fn squirrel_away<T>(+x: @T) -> *rust_box<T> {
     let y: *rust_box<T> = unsafe::reinterpret_cast(x);
diff --git a/src/servo/gfx/geometry.rs b/src/servo/gfx/geometry.rs
index cdca23abc6e..f0c8bf52d69 100644
--- a/src/servo/gfx/geometry.rs
+++ b/src/servo/gfx/geometry.rs
@@ -1,11 +1,11 @@
 import geom::point::Point2D;
 import geom::rect::Rect;
 import geom::size::Size2D;
-import num::num;
+import num::Num;
 
 enum au = int;
 
-impl au : num {
+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) }
@@ -17,7 +17,7 @@ impl au : num {
     pure fn from_int(n: int) -> au       { au(n)              }
 }
 
-fn box<A:copy num>(x: A, y: A, w: A, h: A) -> Rect<A> {
+fn box<A:copy Num>(x: A, y: A, w: A, h: A) -> Rect<A> {
     Rect(Point2D(x, y), Size2D(w, h))
 }
 
diff --git a/src/servo/layout/base.rs b/src/servo/layout/base.rs
index 943ed2a761c..b3488f6216f 100644
--- a/src/servo/layout/base.rs
+++ b/src/servo/layout/base.rs
@@ -19,7 +19,7 @@ import vec::{push, push_all};
 import std::net::url::url;
 import resource::image_cache_task;
 import image_cache_task::ImageCacheTask;
-import core::to_str::to_str;
+import core::to_str::ToStr;
 import std::arc::{arc, clone};
 
 enum BoxKind {
diff --git a/src/servo/layout/inline.rs b/src/servo/layout/inline.rs
index f312a30c73f..bb1d8e19155 100644
--- a/src/servo/layout/inline.rs
+++ b/src/servo/layout/inline.rs
@@ -6,7 +6,7 @@ import dom::style::{Auto, Px};
 import geom::point::Point2D;
 import geom::size::Size2D;
 import gfx::geometry::{au, px_to_au};
-import num::num;
+import num::Num;
 import util::tree;
 
 trait InlineLayout {
diff --git a/src/servo/parser/html_builder.rs b/src/servo/parser/html_builder.rs
index 1eae54d7a9f..f2227ec92be 100644
--- a/src/servo/parser/html_builder.rs
+++ b/src/servo/parser/html_builder.rs
@@ -13,7 +13,7 @@ import vec::{push, push_all_move, flat_map};
 import std::net::url::url;
 import resource::resource_task::{ResourceTask, Load, Payload, Done};
 import result::{ok, err};
-import to_str::to_str;
+import to_str::ToStr;
 
 enum CSSMessage {
     File(url),
diff --git a/src/servo/resource/image_cache_task.rs b/src/servo/resource/image_cache_task.rs
index a9b0792a090..6ee5fd5d397 100644
--- a/src/servo/resource/image_cache_task.rs
+++ b/src/servo/resource/image_cache_task.rs
@@ -15,7 +15,7 @@ import std::arc::arc;
 import clone_arc = std::arc::clone;
 import std::cell::Cell;
 import result::{result, ok, err};
-import to_str::to_str;
+import to_str::ToStr;
 
 enum Msg {
     /// Tell the cache that we may need a particular image soon. Must be posted
diff --git a/src/servo/util/color.rs b/src/servo/util/color.rs
index 093ab9d0287..e4d4f6fadf5 100644
--- a/src/servo/util/color.rs
+++ b/src/servo/util/color.rs
@@ -7,11 +7,11 @@
 import float::round;
 import libc::types::os::arch::c95::c_double;
 import css_colors::*;
-import cmp::eq;
+import cmp::Eq;
 
 enum Color = {red : u8, green : u8, blue : u8, alpha : float};
 
-impl Color : eq {
+impl Color : Eq {
     pure fn eq(&&other: Color) -> bool {
         return self.red == other.red && self.green == other.green && self.blue == other.blue &&
                self.alpha == other.alpha;
diff --git a/src/servo/util/url.rs b/src/servo/util/url.rs
index 02a63e03a62..a9811fbde9f 100644
--- a/src/servo/util/url.rs
+++ b/src/servo/util/url.rs
@@ -102,7 +102,7 @@ mod make_url_tests {
 type UrlMap<T: copy> = hashmap<url, T>;
 
 fn url_map<T: copy>() -> UrlMap<T> {
-    import core::to_str::to_str;
+    import core::to_str::ToStr;
 
     hashmap::<url, T>(|a| str::hash(&a.to_str()),
                       |a, b| str::eq(&a.to_str(), &b.to_str()))