diff --git a/src/rust-geom b/src/rust-geom
index d8d08269548..29ef223a79e 160000
--- a/src/rust-geom
+++ b/src/rust-geom
@@ -1 +1 @@
-Subproject commit d8d082695488d083d7f5c34aebc572285a952f2e
+Subproject commit 29ef223a79e4023f3dd1ddbf16ece4a46c03955d
diff --git a/src/rust-glut b/src/rust-glut
index d4e6a7c8a85..9626ff11e6b 160000
--- a/src/rust-glut
+++ b/src/rust-glut
@@ -1 +1 @@
-Subproject commit d4e6a7c8a85b6d6d2791200bc8bd6b2bbe19b5d4
+Subproject commit 9626ff11e6b04cf9df5997ed818eea7662539ce5
diff --git a/src/rust-http-client b/src/rust-http-client
index 9a1625d59a3..bee86e1fd74 160000
--- a/src/rust-http-client
+++ b/src/rust-http-client
@@ -1 +1 @@
-Subproject commit 9a1625d59a37949bf1c8b86f3766080e1e4d10cd
+Subproject commit bee86e1fd742abf02d769db54b0d8b91734a4bae
diff --git a/src/rust-layers b/src/rust-layers
index 51832ea94b0..412e8ec6982 160000
--- a/src/rust-layers
+++ b/src/rust-layers
@@ -1 +1 @@
-Subproject commit 51832ea94b0ffcd21b6bfba37ad969284c41a07b
+Subproject commit 412e8ec69827031b59af4e35215c6b18fd25e8be
diff --git a/src/rust-mozjs b/src/rust-mozjs
index bbc2ddbe863..1b90c6fd054 160000
--- a/src/rust-mozjs
+++ b/src/rust-mozjs
@@ -1 +1 @@
-Subproject commit bbc2ddbe86393524cccf1fd797ef85213560cce8
+Subproject commit 1b90c6fd054499060ff6a72f41c0c1266dcde062
diff --git a/src/servo/text/native_font/quartz_native_font.rs b/src/servo/text/native_font/quartz_native_font.rs
index 8cced608188..218d02b8dc2 100644
--- a/src/servo/text/native_font/quartz_native_font.rs
+++ b/src/servo/text/native_font/quartz_native_font.rs
@@ -5,7 +5,7 @@ export QuartzNativeFont, with_test_native_font, create;
 import libc::size_t;
 import ptr::null;
 import unsafe::reinterpret_cast;
-import result::{result, ok};
+import result::{Result, Ok};
 import glyph::GlyphIndex;
 import cocoa::cg::{
     CGDataProviderRef,
@@ -38,19 +38,19 @@ struct QuartzNativeFont/& {
         CGDataProviderRelease(self.fontprov);
     }
 
-    fn glyph_index(_codepoint: char) -> option<GlyphIndex> {
+    fn glyph_index(_codepoint: char) -> Option<GlyphIndex> {
         // FIXME
-        some(40u)
+        Some(40u)
     }
 
     // FIXME: What unit is this returning? Let's have a custom type
-    fn glyph_h_advance(_glyph: GlyphIndex) -> option<int> {
+    fn glyph_h_advance(_glyph: GlyphIndex) -> Option<int> {
         // FIXME
-        some(15)
+        Some(15)
     }
 }
 
-fn create(buf: &~[u8]) -> result<QuartzNativeFont, ()> {
+fn create(buf: &~[u8]) -> Result<QuartzNativeFont, ()> {
     let fontprov = vec::as_buf(*buf, |cbuf, len| {
         CGDataProviderCreateWithData(
             null(),
@@ -64,7 +64,7 @@ fn create(buf: &~[u8]) -> result<QuartzNativeFont, ()> {
     // FIXME: Error handling
     assert cgfont.is_not_null();
 
-    return ok(QuartzNativeFont(fontprov, cgfont));
+    return Ok(QuartzNativeFont(fontprov, cgfont));
 }
 
 fn with_test_native_font(f: fn@(nf: &NativeFont)) {