261 files changed, 184 insertions, 117 deletions

diff --git a/src/README.md b/src/README.md
index f27f834f58f..e9b58181e65 100644
--- a/src/README.md
+++ b/src/README.md
@@ -1,54 +1,68 @@
 Descriptions of the Servo source directories. For the most part these represent a single
 crate or library.
 
-## Servo and Rust projects
-
-These are the main servo projects, as well as projects that are pure Rust (not bindings).
-
-* _rust-css_ - A CSS parsing and selector matching library, based on libcss and currently
-    using libcss for the implementation, but not exposing any libcss internals
-* _rust-geom_ - Generic linear algebra library
-* _rust-http-client_ - An HTTP library in Rust, using libuv via the Rust standard library
-* _rust-layers_ - A simple GPU-accelerated 2D scene graph library
-* _servo_ - The Servo web browser engine
-* _servo-gfx_ - Servo's graphics subsystem
-* _sharegl_ - A library for sharing 3D textures between processes
-
-## Third-party projects
-
-* _libcss_ - The CSS library from the NetSurf web browser. We are using this for parsing
-    and selector matching until we have a Rust solution
-* _libhubbub_ - The HTML parser from the NetSurf web browser. We are using this for parsing
-    until we have a Rust solution
-* _libparserutils_ - A parsing library used by libcss and libhubbub
-* _libwapcaplet_ - A string internment library used by libcss and libhubbub
-* _mozjs_ - The SpiderMonkey JavaScript engine, forked from mozilla-central
-* _rust-azure_ - mozilla-central's 2D vector graphics abstraction layer and bindings
-* _rust-harfbuzz_ - The harfbuzz text shaping library and bindings
-* _rust-stb-image_ - The stb_image library and bindings. We are using this for image decoding
-    until we have a higher-performance and/or Rust solution
-* _skia_ - The Skia drawing library, a backend for Azure
-
-## Library bindings
-
-* _rust-cocoa_ - Bindings to OS X's Cocoa framework
-* _rust-core-foundation_ - Bindings to OS X's Core Foundation framework
-* _rust-core-graphics_ - Bindings to OS X's Core Graphics framework, a backend for Azure
-* _rust-core-text_ - Bindings to OS X's Core Text framework
-* _rust-fontconfig_ - Bindings to fontconfig
-* _rust-freetype_ - Bindings to FreeType
-* _rust-glut_ - Bindings to GLUT
-* _rust-hubbub_ - Bindings to libhubbub
-* _rust-io-surface_ - OS X implementation of cross-process surface sharing. Used by sharegl
-* _rust-mozjs_ - Bindings to SpiderMonkey
-* _rust-netsurfcss_ - Bindings to libcss
-* _rust-opengles_ - Bindings to OpenGL ES
-* _rust-wapcaplet_ - Bindings to libwapcaplet
-* _rust-xlib_ - Bindings to xlib
-
-## Other
-
-* _contenttest_ - Test harness for JavaScript bindings
-* _etc_ - Miscellaneous
-* _reftest_ - Test harness for comparing Servo output to Firefox
-* _test_ - Test cases
+## Servo components
+
+* `components/contenttest`: JavaScript test runner.
+* `components/reftest`: Reference (layout) test runner.
+* `components/servo`: The top-level Servo crate. Contains compositing, DOM, layout, and script.
+* `components/servo-gfx`: Graphics rendering, fonts, and text shaping.
+* `components/servo-net`: Networking, caching, image decoding.
+* `components/servo-util`: Various utility functions used by other Servo components.
+
+## The Rust compiler
+
+* `compiler/rust`: The Rust compiler.
+
+## Supporting libraries
+
+These libraries are used in all Servo ports. In keeping with Servo's philosophy of modularity,
+they are designed to be useful in other Rust projects.
+
+* `support/azure`: A cross-platform 2D drawing library from the Mozilla project. Azure can render
+  with Direct2D, Core Graphics (Quartz), Skia, and Cairo.
+* `support/css`: A general CSS parsing and selector matching library. This abstraction layer
+  exists to prevent `libcss` internals from leaking into Servo.
+* `support/geom`: A simple Euclidean geometry and linear algebra library.
+* `support/glut`: Bindings to the GLUT windowing framework. This bare-bones windowing framework is
+  useful for testing the engine without browser chrome.
+* `support/harfbuzz`: A mature Unicode- and OpenType-aware text shaping library, used by many
+  rendering engines and toolkits.
+* `support/http-client`: An HTTP client library for Rust.
+* `support/hubbub`: The HTML parser from the NetSurf project. This is a temporary solution for HTML
+  parsing until a pure-Rust solution is available.
+* `support/layers`: A simple GPU-accelerated 2D scene graph library, somewhat similar to libraries
+  like Clutter.
+* `support/libparserutils`: A parsing library used by `hubbub` and `netsurfcss`.
+* `support/netsurfcss`: The CSS library from the NetSurf project. This is a temporary stopgap for
+  CSS parsing until a pure-Rust solution is available.
+* `support/opengles`: Bindings to OpenGL ES 2.0.
+* `support/sharegl`: A library for sharing OpenGL or Direct3D textures between processes.
+* `support/skia`: Google's accelerated 2D rendering library.
+* `support/spidermonkey`: Mozilla's JavaScript engine.
+* `support/stb-image`: A minimalist image decoding library. This is a temporary stopgap for image
+  decoding until a higher-performance solution is available.
+* `support/wapcaplet`: A string storage library used by `hubbub` and `netsurfcss`.
+
+## Platform-specfic bindings
+
+### Linux
+
+* `platform/linux/rust-fontconfig`: Bindings to the freedesktop.org `fontconfig` library.
+* `platform/linux/rust-freetype`: Bindings to the FreeType library.
+* `platform/linux/rust-xlib`: Bindings to the X Window System libraries.
+
+### Mac
+
+* `platform/macos/rust-cocoa`: General Cocoa bindings.
+* `platform/macos/rust-core-foundation`: Bindings to Core Foundation.
+* `platform/macos/rust-core-graphics`: Bindings to Core Graphics/Quartz.
+* `platform/macos/rust-core-text`: Bindings to Core Text.
+* `platform/macos/rust-io-surface`: Bindings to the `IOSurface` library.
+
+## Miscellaneous
+
+* `etc`: Various scripts and files that don't belong anywhere else.
+* `etc/patches`: Patches for upstream libraries.
+* `test`: Test cases.
+
diff --git a/src/compiler/rust b/src/compiler/rust
new file mode 160000
+Subproject 1b883365bc0813f5775c8207e414b7973e947a7
diff --git a/src/contenttest/contenttest.rs b/src/components/contenttest/contenttest.rs
index 0815cf439e0..0815cf439e0 100644
--- a/src/contenttest/contenttest.rs
+++ b/src/components/contenttest/contenttest.rs
diff --git a/src/reftest/rasterize.py b/src/components/reftest/rasterize.py
index 44170e142a8..44170e142a8 100644
--- a/src/reftest/rasterize.py
+++ b/src/components/reftest/rasterize.py
diff --git a/src/reftest/reftest.rs b/src/components/reftest/reftest.rs
index 8ba59299148..8ba59299148 100644
--- a/src/reftest/reftest.rs
+++ b/src/components/reftest/reftest.rs
diff --git a/src/servo-gfx/color.rs b/src/components/servo-gfx/color.rs
index 274b30a3212..274b30a3212 100644
--- a/src/servo-gfx/color.rs
+++ b/src/components/servo-gfx/color.rs
diff --git a/src/servo-gfx/compositor.rs b/src/components/servo-gfx/compositor.rs
index 7a3681a5721..7a3681a5721 100644
--- a/src/servo-gfx/compositor.rs
+++ b/src/components/servo-gfx/compositor.rs
diff --git a/src/servo-gfx/display_list.rs b/src/components/servo-gfx/display_list.rs
index e79dccea6c2..e79dccea6c2 100644
--- a/src/servo-gfx/display_list.rs
+++ b/src/components/servo-gfx/display_list.rs
diff --git a/src/servo-gfx/font.rs b/src/components/servo-gfx/font.rs
index 9178d69351f..9178d69351f 100644
--- a/src/servo-gfx/font.rs
+++ b/src/components/servo-gfx/font.rs
diff --git a/src/servo-gfx/font_context.rs b/src/components/servo-gfx/font_context.rs
index f690ebcbdf5..f690ebcbdf5 100644
--- a/src/servo-gfx/font_context.rs
+++ b/src/components/servo-gfx/font_context.rs
diff --git a/src/servo-gfx/font_list.rs b/src/components/servo-gfx/font_list.rs
index a67bf8dd951..648a9d7ce35 100644
--- a/src/servo-gfx/font_list.rs
+++ b/src/components/servo-gfx/font_list.rs
@@ -71,7 +71,7 @@ pub impl FontList {
 
     priv fn find_family(&self, family_name: &str) -> Option<@mut FontFamily> {
         // look up canonical name
-        let family = self.family_map.find(&str::from_slice(family_name));
+        let family = self.family_map.find_equiv(&family_name);
 
         let decision = if family.is_some() { "Found" } else { "Couldn't find" };
         debug!("FontList: %s font family with name=%s", decision, family_name);
@@ -90,15 +90,17 @@ pub struct FontFamily {
 impl FontFamily {
     pub fn new(family_name: &str) -> FontFamily {
         FontFamily {
-            family_name: str::from_slice(family_name),
+            family_name: family_name.to_str(),
             entries: ~[],
         }
     }
 
     fn load_family_variations(@mut self, list: &FontListHandle) {
-        if self.entries.len() > 0 { return; }
+        if self.entries.len() > 0 {
+            return
+        }
         list.load_variations_for_family(self);
-        assert!(self.entries.len() > 0);
+        assert!(self.entries.len() > 0)
     }
 
     pub fn find_font_for_style(@mut self, list: &FontListHandle, style: &SpecifiedFontStyle)
diff --git a/src/servo-gfx/freetype_impl/font_context.rs b/src/components/servo-gfx/freetype_impl/font_context.rs
index 35d09e4900a..35d09e4900a 100644
--- a/src/servo-gfx/freetype_impl/font_context.rs
+++ b/src/components/servo-gfx/freetype_impl/font_context.rs
diff --git a/src/servo-gfx/geometry.rs b/src/components/servo-gfx/geometry.rs
index d3b1f019df9..d3b1f019df9 100644
--- a/src/servo-gfx/geometry.rs
+++ b/src/components/servo-gfx/geometry.rs
diff --git a/src/servo-gfx/native.rs b/src/components/servo-gfx/native.rs
index c54196536b1..c54196536b1 100644
--- a/src/servo-gfx/native.rs
+++ b/src/components/servo-gfx/native.rs
diff --git a/src/servo-gfx/opts.rs b/src/components/servo-gfx/opts.rs
index d9c6ff1446c..d9c6ff1446c 100644
--- a/src/servo-gfx/opts.rs
+++ b/src/components/servo-gfx/opts.rs
diff --git a/src/servo-gfx/platform/linux/font.rs b/src/components/servo-gfx/platform/linux/font.rs
index 288a2cf5876..288a2cf5876 100644
--- a/src/servo-gfx/platform/linux/font.rs
+++ b/src/components/servo-gfx/platform/linux/font.rs
diff --git a/src/servo-gfx/platform/linux/font_context.rs b/src/components/servo-gfx/platform/linux/font_context.rs
index 4797dddba1a..4797dddba1a 100644
--- a/src/servo-gfx/platform/linux/font_context.rs
+++ b/src/components/servo-gfx/platform/linux/font_context.rs
diff --git a/src/servo-gfx/platform/linux/font_list.rs b/src/components/servo-gfx/platform/linux/font_list.rs
index f88df304391..f88df304391 100644
--- a/src/servo-gfx/platform/linux/font_list.rs
+++ b/src/components/servo-gfx/platform/linux/font_list.rs
diff --git a/src/servo-gfx/platform/macos/font.rs b/src/components/servo-gfx/platform/macos/font.rs
index dbdbc2a0324..dbdbc2a0324 100644
--- a/src/servo-gfx/platform/macos/font.rs
+++ b/src/components/servo-gfx/platform/macos/font.rs
diff --git a/src/servo-gfx/platform/macos/font_context.rs b/src/components/servo-gfx/platform/macos/font_context.rs
index 1d780cae5cf..1d780cae5cf 100644
--- a/src/servo-gfx/platform/macos/font_context.rs
+++ b/src/components/servo-gfx/platform/macos/font_context.rs
diff --git a/src/servo-gfx/platform/macos/font_list.rs b/src/components/servo-gfx/platform/macos/font_list.rs
index 79698c1cdfd..d453485016c 100644
--- a/src/servo-gfx/platform/macos/font_list.rs
+++ b/src/components/servo-gfx/platform/macos/font_list.rs
@@ -52,7 +52,7 @@ pub impl FontListHandle {
 
             debug!("Creating new FontEntry for face: %s", handle.face_name());
             let entry = @FontEntry::new(family, handle);
-            family.entries.push(entry);
+            family.entries.push(entry)
         }
     }
 }
diff --git a/src/servo-gfx/platform/mod.rs b/src/components/servo-gfx/platform/mod.rs
index 2d8fb4f9ce7..2d8fb4f9ce7 100644
--- a/src/servo-gfx/platform/mod.rs
+++ b/src/components/servo-gfx/platform/mod.rs
diff --git a/src/servo-gfx/render_context.rs b/src/components/servo-gfx/render_context.rs
index 17fb40d825c..17fb40d825c 100644
--- a/src/servo-gfx/render_context.rs
+++ b/src/components/servo-gfx/render_context.rs
diff --git a/src/servo-gfx/render_layers.rs b/src/components/servo-gfx/render_layers.rs
index b680b110092..b680b110092 100644
--- a/src/servo-gfx/render_layers.rs
+++ b/src/components/servo-gfx/render_layers.rs
diff --git a/src/servo-gfx/render_task.rs b/src/components/servo-gfx/render_task.rs
index 897023cd3c8..897023cd3c8 100644
--- a/src/servo-gfx/render_task.rs
+++ b/src/components/servo-gfx/render_task.rs
diff --git a/src/servo-gfx/servo_gfx.rc b/src/components/servo-gfx/servo_gfx.rc
index f785e0fc877..f785e0fc877 100644
--- a/src/servo-gfx/servo_gfx.rc
+++ b/src/components/servo-gfx/servo_gfx.rc
diff --git a/src/servo-gfx/surface.rs b/src/components/servo-gfx/surface.rs
index f1d4e95e658..f1d4e95e658 100644
--- a/src/servo-gfx/surface.rs
+++ b/src/components/servo-gfx/surface.rs
diff --git a/src/servo-gfx/text/glyph.rs b/src/components/servo-gfx/text/glyph.rs
index 3ecc291cc83..7a1dfea9467 100644
--- a/src/servo-gfx/text/glyph.rs
+++ b/src/components/servo-gfx/text/glyph.rs
@@ -588,7 +588,7 @@ pub impl<'self> GlyphStore {
     fn iter_glyphs_for_char_index(&'self self,
                                   i: uint,
                                   cb: &fn(uint, &GlyphInfo<'self>) -> bool)
-                               -> bool {
+                                  -> bool {
         assert!(i < self.entry_buffer.len());
 
         let entry = &self.entry_buffer[i];
@@ -609,30 +609,36 @@ pub impl<'self> GlyphStore {
         true
     }
 
-    fn iter_glyphs_for_char_range(&'self self, range: &Range,
-                                  cb: &fn(uint, &GlyphInfo<'self>) -> bool) {
+    fn iter_glyphs_for_char_range(&'self self,
+                                  range: &Range,
+                                  callback: &fn(uint, &GlyphInfo<'self>) -> bool)
+                                  -> bool {
         if range.begin() >= self.entry_buffer.len() {
             error!("iter_glyphs_for_range: range.begin beyond length!");
-            return;
+            return false
         }
         if range.end() > self.entry_buffer.len() {
             error!("iter_glyphs_for_range: range.end beyond length!");
-            return;
+            return false
         }
 
         for range.eachi |i| {
-            if !self.iter_glyphs_for_char_index(i, cb) {
-                break;
+            if !self.iter_glyphs_for_char_index(i, callback) {
+                break
             }
         }
+
+        true
     }
 
-    fn iter_all_glyphs(&'self self, cb: &fn(uint, &GlyphInfo<'self>) -> bool) {
+    fn iter_all_glyphs(&'self self, cb: &fn(uint, &GlyphInfo<'self>) -> bool) -> bool {
         for uint::range(0, self.entry_buffer.len()) |i| {
             if !self.iter_glyphs_for_char_index(i, cb) {
                 break;
             }
         }
+
+        true
     }
 
     // getter methods
diff --git a/src/servo-gfx/text/mod.rs b/src/components/servo-gfx/text/mod.rs
index edadaae760d..edadaae760d 100644
--- a/src/servo-gfx/text/mod.rs
+++ b/src/components/servo-gfx/text/mod.rs
diff --git a/src/servo-gfx/text/shaper.rs b/src/components/servo-gfx/text/shaper.rs
index 217d2496a9e..217d2496a9e 100644
--- a/src/servo-gfx/text/shaper.rs
+++ b/src/components/servo-gfx/text/shaper.rs
diff --git a/src/servo-gfx/text/shaping/harfbuzz.rs b/src/components/servo-gfx/text/shaping/harfbuzz.rs
index 6cf3ea9ab65..6f5c6c6a6f2 100644
--- a/src/servo-gfx/text/shaping/harfbuzz.rs
+++ b/src/components/servo-gfx/text/shaping/harfbuzz.rs
@@ -357,19 +357,26 @@ impl Shaper {
                         probably doesn't work.");
 
                 let mut all_glyphs_are_within_cluster: bool = true;
-                do glyph_span.eachi |j| {
+                for glyph_span.eachi |j| {
                     let loc = glyph_data.byte_offset_of_glyph(j);
                     if !char_byte_span.contains(loc) {
                         all_glyphs_are_within_cluster = false;
+                        break
+                    }
+
+                    // If true, keep checking. Else, stop.
+                    if !all_glyphs_are_within_cluster {
+                        break
                     }
-                    all_glyphs_are_within_cluster // if true, keep checking. else, stop.
                 }
 
                 debug!("All glyphs within char_byte_span cluster?: %?",
                        all_glyphs_are_within_cluster);
 
                 // found a valid range; stop extending char_span.
-                if all_glyphs_are_within_cluster { break; }
+                if all_glyphs_are_within_cluster {
+                    break
+                }
             }
 
             // character/glyph clump must contain characters.
diff --git a/src/servo-gfx/text/shaping/mod.rs b/src/components/servo-gfx/text/shaping/mod.rs
index db326727127..db326727127 100644
--- a/src/servo-gfx/text/shaping/mod.rs
+++ b/src/components/servo-gfx/text/shaping/mod.rs
diff --git a/src/servo-gfx/text/text_run.rs b/src/components/servo-gfx/text/text_run.rs
index ff5f9cba343..e94dd4a15df 100644
--- a/src/servo-gfx/text/text_run.rs
+++ b/src/components/servo-gfx/text/text_run.rs
@@ -128,7 +128,7 @@ pub impl<'self> TextRun {
         return max_piece_width;
     }
 
-    fn iter_natural_lines_for_range(&self, range: &Range, f: &fn(&Range) -> bool) {
+    fn iter_natural_lines_for_range(&self, range: &Range, f: &fn(&Range) -> bool) -> bool {
         let mut clump = Range::new(range.begin(), 0);
         let mut in_clump = false;
 
@@ -151,9 +151,11 @@ pub impl<'self> TextRun {
             clump.extend_to(range.end());
             f(&clump);
         }
+
+        true
     }
 
-    fn iter_indivisible_pieces_for_range(&self, range: &Range, f: &fn(&Range) -> bool) {
+    fn iter_indivisible_pieces_for_range(&self, range: &Range, f: &fn(&Range) -> bool) -> bool {
         let mut clump = Range::new(range.begin(), 0);
 
         loop {
@@ -165,11 +167,15 @@ pub impl<'self> TextRun {
             }
 
             // now clump.end() is break-before or range.end()
-            if !f(&clump) || clump.end() == range.end() { break; }
+            if !f(&clump) || clump.end() == range.end() {
+                break
+            }
 
             // now clump includes one break-before character, or starts from range.end()
             let end = clump.end(); // FIXME: borrow checker workaround
             clump.reset(end, 1);
         }
+
+        true
     }
 }
diff --git a/src/servo-gfx/text/util.rs b/src/components/servo-gfx/text/util.rs
index a74d59bcbc8..1ce4d4b4ff8 100644
--- a/src/servo-gfx/text/util.rs
+++ b/src/components/servo-gfx/text/util.rs
@@ -127,7 +127,7 @@ pub fn true_type_tag(a: char, b: char, c: char, d: char) -> u32 {
 
 #[test]
 fn test_true_type_tag() {
-    fail_unless!(true_type_tag('c', 'm', 'a', 'p') == 0x_63_6D_61_70_u32);
+    assert!(true_type_tag('c', 'm', 'a', 'p') == 0x_63_6D_61_70_u32);
 }
 
 #[test]
@@ -143,7 +143,7 @@ fn test_transform_compress_none() {
     let mode = CompressNone;
 
     for uint::range(0, test_strs.len()) |i| {
-        fail_unless!(transform_text(test_strs[i], mode) == test_strs[i]);
+        assert!(transform_text(test_strs[i], mode) == test_strs[i]);
     }
 }
 
@@ -166,11 +166,11 @@ fn test_transform_discard_newline() {
                                    ~"foo bar baz",
                                    ~"foobarbaz"];
 
-    fail_unless!(test_strs.len() == oracle_strs.len());
+    assert!(test_strs.len() == oracle_strs.len());
     let mode = DiscardNewline;
 
     for uint::range(0, test_strs.len()) |i| {
-        fail_unless!(transform_text(test_strs[i], mode) == oracle_strs[i]);
+        assert!(transform_text(test_strs[i], mode) == oracle_strs[i]);
     }
 }
 
@@ -192,11 +192,11 @@ fn test_transform_compress_whitespace() {
                                  ~"foo bar baz",
                                  ~"foobarbaz\n\n"];
 
-    fail_unless!(test_strs.len() == oracle_strs.len());
+    assert!(test_strs.len() == oracle_strs.len());
     let mode = CompressWhitespace;
 
     for uint::range(0, test_strs.len()) |i| {
-        fail_unless!(transform_text(test_strs[i], mode) == oracle_strs[i]);
+        assert!(transform_text(test_strs[i], mode) == oracle_strs[i]);
     }
 }
 
@@ -218,10 +218,10 @@ fn test_transform_compress_whitespace_newline() {
                                  ~"foo bar baz",
                                  ~"foobarbaz "];
 
-    fail_unless!(test_strs.len() == oracle_strs.len());
+    assert!(test_strs.len() == oracle_strs.len());
     let mode = CompressWhitespaceNewline;
 
     for uint::range(0, test_strs.len()) |i| {
-        fail_unless!(transform_text(test_strs[i], mode) == oracle_strs[i]);
+        assert!(transform_text(test_strs[i], mode) == oracle_strs[i]);
     }
 }
diff --git a/src/servo-net/file_loader.rs b/src/components/servo-net/file_loader.rs
index e7d03c091eb..e7d03c091eb 100644
--- a/src/servo-net/file_loader.rs
+++ b/src/components/servo-net/file_loader.rs
diff --git a/src/servo-net/http_loader.rs b/src/components/servo-net/http_loader.rs
index 72e9e0acd30..72e9e0acd30 100644
--- a/src/servo-net/http_loader.rs
+++ b/src/components/servo-net/http_loader.rs
diff --git a/src/servo-net/image/base.rs b/src/components/servo-net/image/base.rs
index ae9324c41f2..ae9324c41f2 100644
--- a/src/servo-net/image/base.rs
+++ b/src/components/servo-net/image/base.rs
diff --git a/src/servo-net/image/holder.rs b/src/components/servo-net/image/holder.rs
index 605eea39411..605eea39411 100644
--- a/src/servo-net/image/holder.rs
+++ b/src/components/servo-net/image/holder.rs
diff --git a/src/servo-net/image/test.jpeg b/src/components/servo-net/image/test.jpeg
index 1a0bdb7acd1..1a0bdb7acd1 100644
--- a/src/servo-net/image/test.jpeg
+++ b/src/components/servo-net/image/test.jpeg
diff --git a/src/servo-net/image_cache_task.rs b/src/components/servo-net/image_cache_task.rs
index 1b9d8415f61..32cd0b6a0a8 100644
--- a/src/servo-net/image_cache_task.rs
+++ b/src/components/servo-net/image_cache_task.rs
@@ -12,7 +12,7 @@ use core::cell::Cell;
 use core::comm::{Chan, Port, SharedChan, stream};
 use core::task::spawn;
 use core::to_str::ToStr;
-use core::util::replace;
+use core::util::{replace, swap};
 use std::arc::ARC;
 use std::net::url::Url;
 
@@ -383,7 +383,6 @@ impl ImageCache {
         }
     }
 
-
     priv fn get_image(&self, url: Url, response: Chan<ImageResponseMsg>) {
         match self.get_state(copy url) {
             Init => fail!(~"request for image before prefetch"),
diff --git a/src/servo-net/local_image_cache.rs b/src/components/servo-net/local_image_cache.rs
index eaa23d8e8de..eaa23d8e8de 100644
--- a/src/servo-net/local_image_cache.rs
+++ b/src/components/servo-net/local_image_cache.rs
diff --git a/src/servo-net/resource_task.rs b/src/components/servo-net/resource_task.rs
index 8fef9095387..8fef9095387 100644
--- a/src/servo-net/resource_task.rs
+++ b/src/components/servo-net/resource_task.rs
diff --git a/src/servo-net/servo_net.rc b/src/components/servo-net/servo_net.rc
index 739ec49c637..739ec49c637 100644
--- a/src/servo-net/servo_net.rc
+++ b/src/components/servo-net/servo_net.rc
diff --git a/src/servo-net/util.rs b/src/components/servo-net/util.rs
index ec1aea92e86..ec1aea92e86 100644
--- a/src/servo-net/util.rs
+++ b/src/components/servo-net/util.rs
diff --git a/src/servo-util/cache.rs b/src/components/servo-util/cache.rs
index d6c46065ee7..d6c46065ee7 100644
--- a/src/servo-util/cache.rs
+++ b/src/components/servo-util/cache.rs
diff --git a/src/servo-util/range.rs b/src/components/servo-util/range.rs
index caf3f3d003e..bc5728aa006 100644
--- a/src/servo-util/range.rs
+++ b/src/components/servo-util/range.rs
@@ -31,8 +31,14 @@ pub impl Range {
     fn begin(&self) -> uint { self.off  }
     fn length(&self) -> uint { self.len }
     fn end(&self) -> uint { self.off + self.len }
-    fn eachi(&self, cb: &fn(uint) -> bool) {
-        do uint::range(self.off, self.off + self.len) |i| { cb(i) }
+
+    fn eachi(&self, callback: &fn(uint) -> bool) -> bool {
+        for uint::range(self.off, self.off + self.len) |i| {
+            if !callback(i) {
+                break
+            }
+        }
+        true
     }
 
     fn contains(&self, i: uint) -> bool {
diff --git a/src/servo-util/servo_util.rc b/src/components/servo-util/servo_util.rc
index 5779542af3a..5779542af3a 100644
--- a/src/servo-util/servo_util.rc
+++ b/src/components/servo-util/servo_util.rc
diff --git a/src/servo-util/time.rs b/src/components/servo-util/time.rs
index 3ee12b59401..3ee12b59401 100644
--- a/src/servo-util/time.rs
+++ b/src/components/servo-util/time.rs
diff --git a/src/servo-util/tree.rs b/src/components/servo-util/tree.rs
index 7fc104f984f..23b8ca80d77 100644
--- a/src/servo-util/tree.rs
+++ b/src/components/servo-util/tree.rs
@@ -62,7 +62,7 @@ pub trait TreeUtils {
     fn remove_child(&self, child: Self);
 
     /// Iterates over all children of this node.
-    fn each_child(&self, callback: &fn(Self) -> bool);
+    fn each_child(&self, callback: &fn(Self) -> bool) -> bool;
 
     /// Iterates over this node and all its descendants, in preorder.
     fn traverse_preorder(&self, callback: &fn(Self) -> bool) -> bool;
@@ -132,7 +132,7 @@ impl<NR:TreeNodeRef<N>,N:TreeNode<NR>> TreeUtils for NR {
         }
     }
 
-    fn each_child(&self, callback: &fn(NR) -> bool) {
+    fn each_child(&self, callback: &fn(NR) -> bool) -> bool {
         let mut maybe_current = self.with_base(|n| n.first_child());
         while !maybe_current.is_none() {
             let current = maybe_current.get_ref().clone();
@@ -142,6 +142,8 @@ impl<NR:TreeNodeRef<N>,N:TreeNode<NR>> TreeUtils for NR {
 
             maybe_current = current.with_base(|n| n.next_sibling());
         }
+
+        true
     }
 
     fn traverse_preorder(&self, callback: &fn(NR) -> bool) -> bool {
diff --git a/src/servo-util/url.rs b/src/components/servo-util/url.rs
index 9df4e8c49b2..fea0df23b73 100644
--- a/src/servo-util/url.rs
+++ b/src/components/servo-util/url.rs
@@ -59,8 +59,8 @@ mod make_url_tests {
         let file = ~"local.html";
         let url = make_url(file, None);
         debug!("url: %?", url);
-        fail_unless!(url.scheme == ~"file");
-        fail_unless!(url.path.contains(os::getcwd().to_str()));
+        assert!(url.scheme == ~"file");
+        assert!(url.path.contains(os::getcwd().to_str()));
     }
 
     #[test]
@@ -69,9 +69,9 @@ mod make_url_tests {
         let old_url = make_url(old_str, None);
         let new_str = ~"index.html";
         let new_url = make_url(new_str, Some(old_url));
-        fail_unless!(new_url.scheme == ~"http");
-        fail_unless!(new_url.host == ~"example.com");
-        fail_unless!(new_url.path == ~"/index.html");
+        assert!(new_url.scheme == ~"http");
+        assert!(new_url.host == ~"example.com");
+        assert!(new_url.path == ~"/index.html");
     }
 
     #[test]
@@ -80,9 +80,9 @@ mod make_url_tests {
         let old_url = make_url(old_str, None);
         let new_str = ~"index.html";
         let new_url = make_url(new_str, Some(old_url));
-        fail_unless!(new_url.scheme == ~"http");
-        fail_unless!(new_url.host == ~"example.com");
-        fail_unless!(new_url.path == ~"/index.html");
+        assert!(new_url.scheme == ~"http");
+        assert!(new_url.host == ~"example.com");
+        assert!(new_url.path == ~"/index.html");
     }
 
     #[test]
@@ -91,9 +91,9 @@ mod make_url_tests {
         let old_url = make_url(old_str, None);
         let new_str = ~"crumpet.html";
         let new_url = make_url(new_str, Some(old_url));
-        fail_unless!(new_url.scheme == ~"http");
-        fail_unless!(new_url.host == ~"example.com");
-        fail_unless!(new_url.path == ~"/crumpet.html");
+        assert!(new_url.scheme == ~"http");
+        assert!(new_url.host == ~"example.com");
+        assert!(new_url.path == ~"/crumpet.html");
     }
 
     #[test]
@@ -102,9 +102,9 @@ mod make_url_tests {
         let old_url = make_url(old_str, None);
         let new_str = ~"crumpet.html";
         let new_url = make_url(new_str, Some(old_url));
-        fail_unless!(new_url.scheme == ~"http");
-        fail_unless!(new_url.host == ~"example.com");
-        fail_unless!(new_url.path == ~"/snarf/crumpet.html");
+        assert!(new_url.scheme == ~"http");
+        assert!(new_url.host == ~"example.com");
+        assert!(new_url.path == ~"/snarf/crumpet.html");
     }
 
 }
diff --git a/src/servo-util/vec.rs b/src/components/servo-util/vec.rs
index 8a0ebf9edfa..8a0ebf9edfa 100644
--- a/src/servo-util/vec.rs
+++ b/src/components/servo-util/vec.rs
diff --git a/src/servo/compositing/mod.rs b/src/components/servo/compositing/mod.rs
index 3ec1e9d7f36..f6f4c9f5822 100644
--- a/src/servo/compositing/mod.rs
+++ b/src/components/servo/compositing/mod.rs
@@ -244,7 +244,7 @@ fn lend_surface(surfaces: &mut SurfaceSet, receiver: Chan<LayerBufferSet>) {
     // Now we don't have it
     surfaces.front.have = false;
     // But we (hopefully) have another!
-    surfaces.front <-> surfaces.back;
+    util::swap(&mut surfaces.front, &mut surfaces.back);
     // Let's look
     assert!(surfaces.front.have);
 }
diff --git a/src/servo/compositing/resize_rate_limiter.rs b/src/components/servo/compositing/resize_rate_limiter.rs
index a030b43aa36..a030b43aa36 100644
--- a/src/servo/compositing/resize_rate_limiter.rs
+++ b/src/components/servo/compositing/resize_rate_limiter.rs
diff --git a/src/servo/content/content_task.rs b/src/components/servo/content/content_task.rs
index 695d2a76542..e8cfcf3310b 100644
--- a/src/servo/content/content_task.rs
+++ b/src/components/servo/content/content_task.rs
@@ -21,6 +21,7 @@ use core::io::read_whole_file;
 use core::pipes::select2i;
 use core::ptr::null;
 use core::task::{SingleThreaded, task};
+use core::local_data;
 use core::util::replace;
 use dom;
 use geom::size::Size2D;
@@ -153,7 +154,9 @@ pub fn Content(layout_task: LayoutTask,
     };
 
     cx.set_cx_private(ptr::to_unsafe_ptr(&*content) as *());
-    unsafe { local_data::local_data_set(global_content_key, cast::transmute(content)); }
+    unsafe {
+        local_data::local_data_set(global_content_key, cast::transmute(content));
+    }
 
     content
 }
diff --git a/src/servo/content/jsnames.rs b/src/components/servo/content/jsnames.rs
index 2e34eaf0f36..2e34eaf0f36 100644
--- a/src/servo/content/jsnames.rs
+++ b/src/components/servo/content/jsnames.rs
diff --git a/src/servo/css/matching.rs b/src/components/servo/css/matching.rs
index 3a95aceac07..3a95aceac07 100644
--- a/src/servo/css/matching.rs
+++ b/src/components/servo/css/matching.rs
diff --git a/src/servo/css/node_style.rs b/src/components/servo/css/node_style.rs
index c6b72a7cb70..c6b72a7cb70 100644
--- a/src/servo/css/node_style.rs
+++ b/src/components/servo/css/node_style.rs
diff --git a/src/servo/css/node_util.rs b/src/components/servo/css/node_util.rs
index 0dc15dc6518..0dc15dc6518 100644
--- a/src/servo/css/node_util.rs
+++ b/src/components/servo/css/node_util.rs
diff --git a/src/servo/css/node_void_ptr.rs b/src/components/servo/css/node_void_ptr.rs
index 3c25e0091c5..3c25e0091c5 100644
--- a/src/servo/css/node_void_ptr.rs
+++ b/src/components/servo/css/node_void_ptr.rs
diff --git a/src/servo/css/select.rs b/src/components/servo/css/select.rs
index 71f5327cedb..71f5327cedb 100644
--- a/src/servo/css/select.rs
+++ b/src/components/servo/css/select.rs
diff --git a/src/servo/css/select_handler.rs b/src/components/servo/css/select_handler.rs
index 7dec3aae654..7dec3aae654 100644
--- a/src/servo/css/select_handler.rs
+++ b/src/components/servo/css/select_handler.rs
diff --git a/src/servo/dom/bindings/clientrect.rs b/src/components/servo/dom/bindings/clientrect.rs
index 06c5be0cf5b..06c5be0cf5b 100644
--- a/src/servo/dom/bindings/clientrect.rs
+++ b/src/components/servo/dom/bindings/clientrect.rs
diff --git a/src/servo/dom/bindings/clientrectlist.rs b/src/components/servo/dom/bindings/clientrectlist.rs
index bc684b8c8b7..bc684b8c8b7 100644
--- a/src/servo/dom/bindings/clientrectlist.rs
+++ b/src/components/servo/dom/bindings/clientrectlist.rs
diff --git a/src/servo/dom/bindings/codegen/BindingGen.py b/src/components/servo/dom/bindings/codegen/BindingGen.py
index e292427e33b..e292427e33b 100644
--- a/src/servo/dom/bindings/codegen/BindingGen.py
+++ b/src/components/servo/dom/bindings/codegen/BindingGen.py
diff --git a/src/servo/dom/bindings/codegen/BindingUtils.cpp b/src/components/servo/dom/bindings/codegen/BindingUtils.cpp
index 27ac92e3596..27ac92e3596 100644
--- a/src/servo/dom/bindings/codegen/BindingUtils.cpp
+++ b/src/components/servo/dom/bindings/codegen/BindingUtils.cpp
diff --git a/src/servo/dom/bindings/codegen/BindingUtils.h b/src/components/servo/dom/bindings/codegen/BindingUtils.h
index ee9d6c3691c..ee9d6c3691c 100644
--- a/src/servo/dom/bindings/codegen/BindingUtils.h
+++ b/src/components/servo/dom/bindings/codegen/BindingUtils.h
diff --git a/src/servo/dom/bindings/codegen/Bindings.conf b/src/components/servo/dom/bindings/codegen/Bindings.conf
index 442bd0b432c..442bd0b432c 100644
--- a/src/servo/dom/bindings/codegen/Bindings.conf
+++ b/src/components/servo/dom/bindings/codegen/Bindings.conf
diff --git a/src/servo/dom/bindings/codegen/ClientRect.webidl b/src/components/servo/dom/bindings/codegen/ClientRect.webidl
index dcec655aca7..dcec655aca7 100644
--- a/src/servo/dom/bindings/codegen/ClientRect.webidl
+++ b/src/components/servo/dom/bindings/codegen/ClientRect.webidl
diff --git a/src/servo/dom/bindings/codegen/ClientRectList.webidl b/src/components/servo/dom/bindings/codegen/ClientRectList.webidl
index 964425bd0f8..964425bd0f8 100644
--- a/src/servo/dom/bindings/codegen/ClientRectList.webidl
+++ b/src/components/servo/dom/bindings/codegen/ClientRectList.webidl
diff --git a/src/servo/dom/bindings/codegen/Codegen.py b/src/components/servo/dom/bindings/codegen/Codegen.py
index 6d2cc0bde36..6d2cc0bde36 100644
--- a/src/servo/dom/bindings/codegen/Codegen.py
+++ b/src/components/servo/dom/bindings/codegen/Codegen.py
diff --git a/src/servo/dom/bindings/codegen/CodegenRust.py b/src/components/servo/dom/bindings/codegen/CodegenRust.py
index 7502d112aa9..7502d112aa9 100644
--- a/src/servo/dom/bindings/codegen/CodegenRust.py
+++ b/src/components/servo/dom/bindings/codegen/CodegenRust.py
diff --git a/src/servo/dom/bindings/codegen/Configuration.py b/src/components/servo/dom/bindings/codegen/Configuration.py
index 46e16fdc37c..46e16fdc37c 100644
--- a/src/servo/dom/bindings/codegen/Configuration.py
+++ b/src/components/servo/dom/bindings/codegen/Configuration.py
diff --git a/src/servo/dom/bindings/codegen/DOMJSClass.h b/src/components/servo/dom/bindings/codegen/DOMJSClass.h
index 151960b5901..151960b5901 100644
--- a/src/servo/dom/bindings/codegen/DOMJSClass.h
+++ b/src/components/servo/dom/bindings/codegen/DOMJSClass.h
diff --git a/src/servo/dom/bindings/codegen/DOMJSProxyHandler.cpp b/src/components/servo/dom/bindings/codegen/DOMJSProxyHandler.cpp
index af45cc6ed1a..af45cc6ed1a 100644
--- a/src/servo/dom/bindings/codegen/DOMJSProxyHandler.cpp
+++ b/src/components/servo/dom/bindings/codegen/DOMJSProxyHandler.cpp
diff --git a/src/servo/dom/bindings/codegen/DOMJSProxyHandler.h b/src/components/servo/dom/bindings/codegen/DOMJSProxyHandler.h
index 394e2dc4d2f..394e2dc4d2f 100644
--- a/src/servo/dom/bindings/codegen/DOMJSProxyHandler.h
+++ b/src/components/servo/dom/bindings/codegen/DOMJSProxyHandler.h
diff --git a/src/servo/dom/bindings/codegen/DOMParser.webidl b/src/components/servo/dom/bindings/codegen/DOMParser.webidl
index 435cd8dda92..435cd8dda92 100644
--- a/src/servo/dom/bindings/codegen/DOMParser.webidl
+++ b/src/components/servo/dom/bindings/codegen/DOMParser.webidl
diff --git a/src/servo/dom/bindings/codegen/ErrorResult.h b/src/components/servo/dom/bindings/codegen/ErrorResult.h
index bbd9404a865..bbd9404a865 100644
--- a/src/servo/dom/bindings/codegen/ErrorResult.h
+++ b/src/components/servo/dom/bindings/codegen/ErrorResult.h
diff --git a/src/servo/dom/bindings/codegen/Errors.msg b/src/components/servo/dom/bindings/codegen/Errors.msg
index 81d6624cec8..81d6624cec8 100644
--- a/src/servo/dom/bindings/codegen/Errors.msg
+++ b/src/components/servo/dom/bindings/codegen/Errors.msg
diff --git a/src/servo/dom/bindings/codegen/Event.webidl b/src/components/servo/dom/bindings/codegen/Event.webidl
index 48af319ada0..48af319ada0 100644
--- a/src/servo/dom/bindings/codegen/Event.webidl
+++ b/src/components/servo/dom/bindings/codegen/Event.webidl
diff --git a/src/servo/dom/bindings/codegen/EventTarget.webidl b/src/components/servo/dom/bindings/codegen/EventTarget.webidl
index f4e1ba00f70..f4e1ba00f70 100644
--- a/src/servo/dom/bindings/codegen/EventTarget.webidl
+++ b/src/components/servo/dom/bindings/codegen/EventTarget.webidl
diff --git a/src/servo/dom/bindings/codegen/GenerateCSS2PropertiesWebIDL.py b/src/components/servo/dom/bindings/codegen/GenerateCSS2PropertiesWebIDL.py
index 1bb50afaee7..1bb50afaee7 100644
--- a/src/servo/dom/bindings/codegen/GenerateCSS2PropertiesWebIDL.py
+++ b/src/components/servo/dom/bindings/codegen/GenerateCSS2PropertiesWebIDL.py
diff --git a/src/servo/dom/bindings/codegen/GlobalGen.py b/src/components/servo/dom/bindings/codegen/GlobalGen.py
index dbfc4f86e14..dbfc4f86e14 100644
--- a/src/servo/dom/bindings/codegen/GlobalGen.py
+++ b/src/components/servo/dom/bindings/codegen/GlobalGen.py
diff --git a/src/servo/dom/bindings/codegen/HTMLCollection.webidl b/src/components/servo/dom/bindings/codegen/HTMLCollection.webidl
index 5797f85e392..5797f85e392 100644
--- a/src/servo/dom/bindings/codegen/HTMLCollection.webidl
+++ b/src/components/servo/dom/bindings/codegen/HTMLCollection.webidl
diff --git a/src/servo/dom/bindings/codegen/Makefile.in b/src/components/servo/dom/bindings/codegen/Makefile.in
index 69fe4be4e9b..69fe4be4e9b 100644
--- a/src/servo/dom/bindings/codegen/Makefile.in
+++ b/src/components/servo/dom/bindings/codegen/Makefile.in
diff --git a/src/servo/dom/bindings/codegen/Nullable.h b/src/components/servo/dom/bindings/codegen/Nullable.h
index 8b2cc08642b..8b2cc08642b 100644
--- a/src/servo/dom/bindings/codegen/Nullable.h
+++ b/src/components/servo/dom/bindings/codegen/Nullable.h
diff --git a/src/servo/dom/bindings/codegen/PrimitiveConversions.h b/src/components/servo/dom/bindings/codegen/PrimitiveConversions.h
index 40c27425772..40c27425772 100644
--- a/src/servo/dom/bindings/codegen/PrimitiveConversions.h
+++ b/src/components/servo/dom/bindings/codegen/PrimitiveConversions.h
diff --git a/src/servo/dom/bindings/codegen/RegisterBindings.cpp b/src/components/servo/dom/bindings/codegen/RegisterBindings.cpp
index 74244842a21..74244842a21 100644
--- a/src/servo/dom/bindings/codegen/RegisterBindings.cpp
+++ b/src/components/servo/dom/bindings/codegen/RegisterBindings.cpp
diff --git a/src/servo/dom/bindings/codegen/RegisterBindings.h b/src/components/servo/dom/bindings/codegen/RegisterBindings.h
index 7d83a747cc3..7d83a747cc3 100644
--- a/src/servo/dom/bindings/codegen/RegisterBindings.h
+++ b/src/components/servo/dom/bindings/codegen/RegisterBindings.h
diff --git a/src/servo/dom/bindings/codegen/TypedArray.h b/src/components/servo/dom/bindings/codegen/TypedArray.h
index 2a6f17bcb96..2a6f17bcb96 100644
--- a/src/servo/dom/bindings/codegen/TypedArray.h
+++ b/src/components/servo/dom/bindings/codegen/TypedArray.h
diff --git a/src/servo/dom/bindings/codegen/crashtests/769464.html b/src/components/servo/dom/bindings/codegen/crashtests/769464.html
index 84d6dbc08b4..84d6dbc08b4 100644
--- a/src/servo/dom/bindings/codegen/crashtests/769464.html
+++ b/src/components/servo/dom/bindings/codegen/crashtests/769464.html
diff --git a/src/servo/dom/bindings/codegen/crashtests/crashtests.list b/src/components/servo/dom/bindings/codegen/crashtests/crashtests.list
index cb954bd91fc..cb954bd91fc 100644
--- a/src/servo/dom/bindings/codegen/crashtests/crashtests.list
+++ b/src/components/servo/dom/bindings/codegen/crashtests/crashtests.list
diff --git a/src/servo/dom/bindings/codegen/parser/README b/src/components/servo/dom/bindings/codegen/parser/README
index 94b64b88459..94b64b88459 100644
--- a/src/servo/dom/bindings/codegen/parser/README
+++ b/src/components/servo/dom/bindings/codegen/parser/README
diff --git a/src/servo/dom/bindings/codegen/parser/UPSTREAM b/src/components/servo/dom/bindings/codegen/parser/UPSTREAM
index 7ac5899379e..7ac5899379e 100644
--- a/src/servo/dom/bindings/codegen/parser/UPSTREAM
+++ b/src/components/servo/dom/bindings/codegen/parser/UPSTREAM
diff --git a/src/servo/dom/bindings/codegen/parser/WebIDL.py b/src/components/servo/dom/bindings/codegen/parser/WebIDL.py
index 98273a419e6..98273a419e6 100644
--- a/src/servo/dom/bindings/codegen/parser/WebIDL.py
+++ b/src/components/servo/dom/bindings/codegen/parser/WebIDL.py
diff --git a/src/servo/dom/bindings/codegen/parser/runtests.py b/src/components/servo/dom/bindings/codegen/parser/runtests.py
index 98a7d2b81d3..98a7d2b81d3 100644
--- a/src/servo/dom/bindings/codegen/parser/runtests.py
+++ b/src/components/servo/dom/bindings/codegen/parser/runtests.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_any_null.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_any_null.py
index e3b690bf6f1..e3b690bf6f1 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_any_null.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_any_null.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_argument_identifier_conflicts.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_argument_identifier_conflicts.py
index eb1f6d3c92e..eb1f6d3c92e 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_argument_identifier_conflicts.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_argument_identifier_conflicts.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_argument_novoid.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_argument_novoid.py
index ef8c2229aed..ef8c2229aed 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_argument_novoid.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_argument_novoid.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_array_of_interface.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_array_of_interface.py
index 26528984595..26528984595 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_array_of_interface.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_array_of_interface.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_arraybuffer.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_arraybuffer.py
index 5b8e56f86ca..5b8e56f86ca 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_arraybuffer.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_arraybuffer.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_attr.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_attr.py
index 6b6142b6243..6b6142b6243 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_attr.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_attr.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_attr_sequence_type.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_attr_sequence_type.py
index fb1b97812bc..fb1b97812bc 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_attr_sequence_type.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_attr_sequence_type.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_builtin_filename.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_builtin_filename.py
index 631e52eba0b..631e52eba0b 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_builtin_filename.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_builtin_filename.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_builtins.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_builtins.py
index f8563fc2d9b..f8563fc2d9b 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_builtins.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_builtins.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_callback.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_callback.py
index 267d27dc087..267d27dc087 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_callback.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_callback.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_callback_interface.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_callback_interface.py
index 80896ca1edb..80896ca1edb 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_callback_interface.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_callback_interface.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_const.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_const.py
index 12f411363fb..12f411363fb 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_const.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_const.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_constructor.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_constructor.py
index 6ec1be1871b..6ec1be1871b 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_constructor.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_constructor.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_constructor_no_interface_object.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_constructor_no_interface_object.py
index 192c5f6f97b..192c5f6f97b 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_constructor_no_interface_object.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_constructor_no_interface_object.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_deduplicate.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_deduplicate.py
index 6249d36fb8f..6249d36fb8f 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_deduplicate.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_deduplicate.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_dictionary.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_dictionary.py
index 9ae9eb2b66f..9ae9eb2b66f 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_dictionary.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_dictionary.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_distinguishability.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_distinguishability.py
index 86847800631..86847800631 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_distinguishability.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_distinguishability.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_double_null.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_double_null.py
index 700c7eade00..700c7eade00 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_double_null.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_double_null.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_duplicate_qualifiers.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_duplicate_qualifiers.py
index 799f2e0e0ed..799f2e0e0ed 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_duplicate_qualifiers.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_duplicate_qualifiers.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_empty_enum.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_empty_enum.py
index ee0079f06da..ee0079f06da 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_empty_enum.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_empty_enum.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_enum.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_enum.py
index 69a6932062d..69a6932062d 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_enum.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_enum.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_enum_duplicate_values.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_enum_duplicate_values.py
index 51205d209e7..51205d209e7 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_enum_duplicate_values.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_enum_duplicate_values.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_error_colno.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_error_colno.py
index ca0674aec04..ca0674aec04 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_error_colno.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_error_colno.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_error_lineno.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_error_lineno.py
index f11222e7a4d..f11222e7a4d 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_error_lineno.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_error_lineno.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_extended_attributes.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_extended_attributes.py
index 5c6887331e7..5c6887331e7 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_extended_attributes.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_extended_attributes.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_forward_decl.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_forward_decl.py
index cac24c832cc..cac24c832cc 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_forward_decl.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_forward_decl.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_implements.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_implements.py
index 04c47d92abe..04c47d92abe 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_implements.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_implements.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_incomplete_parent.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_incomplete_parent.py
index 1f520a28e16..1f520a28e16 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_incomplete_parent.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_incomplete_parent.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_incomplete_types.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_incomplete_types.py
index fdc39604070..fdc39604070 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_incomplete_types.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_incomplete_types.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_interface.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_interface.py
index 5b07172c636..5b07172c636 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_interface.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_interface.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_interface_const_identifier_conflicts.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_interface_const_identifier_conflicts.py
index db944e7aaf7..db944e7aaf7 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_interface_const_identifier_conflicts.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_interface_const_identifier_conflicts.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_interface_identifier_conflicts_across_members.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_interface_identifier_conflicts_across_members.py
index 1a73fb917ed..1a73fb917ed 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_interface_identifier_conflicts_across_members.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_interface_identifier_conflicts_across_members.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_method.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_method.py
index 40b2d2cf8b9..40b2d2cf8b9 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_method.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_method.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_nullable_equivalency.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_nullable_equivalency.py
index 3366b9fbbbd..3366b9fbbbd 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_nullable_equivalency.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_nullable_equivalency.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_nullable_void.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_nullable_void.py
index 961ff825e9f..961ff825e9f 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_nullable_void.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_nullable_void.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_optional_constraints.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_optional_constraints.py
index 1dcdc7fb8a5..1dcdc7fb8a5 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_optional_constraints.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_optional_constraints.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_overload.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_overload.py
index 59d9be54e53..59d9be54e53 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_overload.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_overload.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_sanity.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_sanity.py
index d3184c00731..d3184c00731 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_sanity.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_sanity.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_special_method_signature_mismatch.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_special_method_signature_mismatch.py
index 5ea1743d36a..5ea1743d36a 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_special_method_signature_mismatch.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_special_method_signature_mismatch.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_special_methods.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_special_methods.py
index 695cfe4f250..695cfe4f250 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_special_methods.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_special_methods.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_special_methods_uniqueness.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_special_methods_uniqueness.py
index 42e2c5bb71b..42e2c5bb71b 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_special_methods_uniqueness.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_special_methods_uniqueness.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_treatNonCallableAsNull.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_treatNonCallableAsNull.py
index 3d0e5ca479f..3d0e5ca479f 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_treatNonCallableAsNull.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_treatNonCallableAsNull.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_typedef.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_typedef.py
index 9d2f3b3c2ce..9d2f3b3c2ce 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_typedef.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_typedef.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_union.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_union.py
index 68c2bcade8c..68c2bcade8c 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_union.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_union.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_union_any.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_union_any.py
index e34cadab470..e34cadab470 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_union_any.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_union_any.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_union_nullable.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_union_nullable.py
index 08430a94a2e..08430a94a2e 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_union_nullable.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_union_nullable.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_variadic_callback.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_variadic_callback.py
index d9a78db2043..d9a78db2043 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_variadic_callback.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_variadic_callback.py
diff --git a/src/servo/dom/bindings/codegen/parser/tests/test_variadic_constraints.py b/src/components/servo/dom/bindings/codegen/parser/tests/test_variadic_constraints.py
index 9cba22c5842..9cba22c5842 100644
--- a/src/servo/dom/bindings/codegen/parser/tests/test_variadic_constraints.py
+++ b/src/components/servo/dom/bindings/codegen/parser/tests/test_variadic_constraints.py
diff --git a/src/servo/dom/bindings/codegen/ply/COPYING b/src/components/servo/dom/bindings/codegen/ply/COPYING
index 3b107de4508..3b107de4508 100644
--- a/src/servo/dom/bindings/codegen/ply/COPYING
+++ b/src/components/servo/dom/bindings/codegen/ply/COPYING
diff --git a/src/servo/dom/bindings/codegen/ply/README b/src/components/servo/dom/bindings/codegen/ply/README
index 2459c490197..2459c490197 100644
--- a/src/servo/dom/bindings/codegen/ply/README
+++ b/src/components/servo/dom/bindings/codegen/ply/README
diff --git a/src/servo/dom/bindings/codegen/ply/ply/__init__.py b/src/components/servo/dom/bindings/codegen/ply/ply/__init__.py
index 853a985542b..853a985542b 100644
--- a/src/servo/dom/bindings/codegen/ply/ply/__init__.py
+++ b/src/components/servo/dom/bindings/codegen/ply/ply/__init__.py
diff --git a/src/servo/dom/bindings/codegen/ply/ply/lex.py b/src/components/servo/dom/bindings/codegen/ply/ply/lex.py
index 267ec100fc2..267ec100fc2 100644
--- a/src/servo/dom/bindings/codegen/ply/ply/lex.py
+++ b/src/components/servo/dom/bindings/codegen/ply/ply/lex.py
diff --git a/src/servo/dom/bindings/codegen/ply/ply/yacc.py b/src/components/servo/dom/bindings/codegen/ply/ply/yacc.py
index e9f5c657551..e9f5c657551 100644
--- a/src/servo/dom/bindings/codegen/ply/ply/yacc.py
+++ b/src/components/servo/dom/bindings/codegen/ply/ply/yacc.py
diff --git a/src/servo/dom/bindings/codegen/pythonpath.py b/src/components/servo/dom/bindings/codegen/pythonpath.py
index 49b2d2f740f..49b2d2f740f 100644
--- a/src/servo/dom/bindings/codegen/pythonpath.py
+++ b/src/components/servo/dom/bindings/codegen/pythonpath.py
diff --git a/src/servo/dom/bindings/codegen/stubgenerator/Skeleton.cpp b/src/components/servo/dom/bindings/codegen/stubgenerator/Skeleton.cpp
index dfa17d23400..dfa17d23400 100644
--- a/src/servo/dom/bindings/codegen/stubgenerator/Skeleton.cpp
+++ b/src/components/servo/dom/bindings/codegen/stubgenerator/Skeleton.cpp
diff --git a/src/servo/dom/bindings/codegen/stubgenerator/Skeleton.h b/src/components/servo/dom/bindings/codegen/stubgenerator/Skeleton.h
index 286cff9af4a..286cff9af4a 100644
--- a/src/servo/dom/bindings/codegen/stubgenerator/Skeleton.h
+++ b/src/components/servo/dom/bindings/codegen/stubgenerator/Skeleton.h
diff --git a/src/servo/dom/bindings/codegen/stubgenerator/generate.sh b/src/components/servo/dom/bindings/codegen/stubgenerator/generate.sh
index 52577f6f42f..52577f6f42f 100644
--- a/src/servo/dom/bindings/codegen/stubgenerator/generate.sh
+++ b/src/components/servo/dom/bindings/codegen/stubgenerator/generate.sh
diff --git a/src/servo/dom/bindings/codegen/test/Makefile.in b/src/components/servo/dom/bindings/codegen/test/Makefile.in
index de388187c87..de388187c87 100644
--- a/src/servo/dom/bindings/codegen/test/Makefile.in
+++ b/src/components/servo/dom/bindings/codegen/test/Makefile.in
diff --git a/src/servo/dom/bindings/codegen/test/TestBindingHeader.h b/src/components/servo/dom/bindings/codegen/test/TestBindingHeader.h
index 1fbab0a9fb8..1fbab0a9fb8 100644
--- a/src/servo/dom/bindings/codegen/test/TestBindingHeader.h
+++ b/src/components/servo/dom/bindings/codegen/test/TestBindingHeader.h
diff --git a/src/servo/dom/bindings/codegen/test/TestCodeGen.webidl b/src/components/servo/dom/bindings/codegen/test/TestCodeGen.webidl
index 8c2b3c1b6b4..8c2b3c1b6b4 100644
--- a/src/servo/dom/bindings/codegen/test/TestCodeGen.webidl
+++ b/src/components/servo/dom/bindings/codegen/test/TestCodeGen.webidl
diff --git a/src/servo/dom/bindings/codegen/test/TestDictionary.webidl b/src/components/servo/dom/bindings/codegen/test/TestDictionary.webidl
index 3dd91bd6500..3dd91bd6500 100644
--- a/src/servo/dom/bindings/codegen/test/TestDictionary.webidl
+++ b/src/components/servo/dom/bindings/codegen/test/TestDictionary.webidl
diff --git a/src/servo/dom/bindings/codegen/test/TestTypedef.webidl b/src/components/servo/dom/bindings/codegen/test/TestTypedef.webidl
index 7f758c79e8f..7f758c79e8f 100644
--- a/src/servo/dom/bindings/codegen/test/TestTypedef.webidl
+++ b/src/components/servo/dom/bindings/codegen/test/TestTypedef.webidl
diff --git a/src/servo/dom/bindings/codegen/test/file_bug775543.html b/src/components/servo/dom/bindings/codegen/test/file_bug775543.html
index ee8c14c4d9c..ee8c14c4d9c 100644
--- a/src/servo/dom/bindings/codegen/test/file_bug775543.html
+++ b/src/components/servo/dom/bindings/codegen/test/file_bug775543.html
diff --git a/src/servo/dom/bindings/codegen/test/forOf_iframe.html b/src/components/servo/dom/bindings/codegen/test/forOf_iframe.html
index 91417aba0e8..91417aba0e8 100644
--- a/src/servo/dom/bindings/codegen/test/forOf_iframe.html
+++ b/src/components/servo/dom/bindings/codegen/test/forOf_iframe.html
diff --git a/src/servo/dom/bindings/codegen/test/test_InstanceOf.html b/src/components/servo/dom/bindings/codegen/test/test_InstanceOf.html
index 3a5a76b1b21..3a5a76b1b21 100644
--- a/src/servo/dom/bindings/codegen/test/test_InstanceOf.html
+++ b/src/components/servo/dom/bindings/codegen/test/test_InstanceOf.html
diff --git a/src/servo/dom/bindings/codegen/test/test_bug773326.html b/src/components/servo/dom/bindings/codegen/test/test_bug773326.html
index 2e3b1ea304d..2e3b1ea304d 100644
--- a/src/servo/dom/bindings/codegen/test/test_bug773326.html
+++ b/src/components/servo/dom/bindings/codegen/test/test_bug773326.html
diff --git a/src/servo/dom/bindings/codegen/test/test_bug775543.html b/src/components/servo/dom/bindings/codegen/test/test_bug775543.html
index d8df05f630f..d8df05f630f 100644
--- a/src/servo/dom/bindings/codegen/test/test_bug775543.html
+++ b/src/components/servo/dom/bindings/codegen/test/test_bug775543.html
diff --git a/src/servo/dom/bindings/codegen/test/test_bug788369.html b/src/components/servo/dom/bindings/codegen/test/test_bug788369.html
index 787bd28fe34..787bd28fe34 100644
--- a/src/servo/dom/bindings/codegen/test/test_bug788369.html
+++ b/src/components/servo/dom/bindings/codegen/test/test_bug788369.html
diff --git a/src/servo/dom/bindings/codegen/test/test_enums.html b/src/components/servo/dom/bindings/codegen/test/test_enums.html
index e5dc519a0c9..e5dc519a0c9 100644
--- a/src/servo/dom/bindings/codegen/test/test_enums.html
+++ b/src/components/servo/dom/bindings/codegen/test/test_enums.html
diff --git a/src/servo/dom/bindings/codegen/test/test_forOf.html b/src/components/servo/dom/bindings/codegen/test/test_forOf.html
index b1a3032a385..b1a3032a385 100644
--- a/src/servo/dom/bindings/codegen/test/test_forOf.html
+++ b/src/components/servo/dom/bindings/codegen/test/test_forOf.html
diff --git a/src/servo/dom/bindings/codegen/test/test_integers.html b/src/components/servo/dom/bindings/codegen/test/test_integers.html
index 6799fd791a8..6799fd791a8 100644
--- a/src/servo/dom/bindings/codegen/test/test_integers.html
+++ b/src/components/servo/dom/bindings/codegen/test/test_integers.html
diff --git a/src/servo/dom/bindings/codegen/test/test_interfaceToString.html b/src/components/servo/dom/bindings/codegen/test/test_interfaceToString.html
index cf670bf2d54..cf670bf2d54 100644
--- a/src/servo/dom/bindings/codegen/test/test_interfaceToString.html
+++ b/src/components/servo/dom/bindings/codegen/test/test_interfaceToString.html
diff --git a/src/servo/dom/bindings/codegen/test/test_lookupGetter.html b/src/components/servo/dom/bindings/codegen/test/test_lookupGetter.html
index 306ee4f643c..306ee4f643c 100644
--- a/src/servo/dom/bindings/codegen/test/test_lookupGetter.html
+++ b/src/components/servo/dom/bindings/codegen/test/test_lookupGetter.html
diff --git a/src/servo/dom/bindings/codegen/test/test_sequence_wrapping.html b/src/components/servo/dom/bindings/codegen/test/test_sequence_wrapping.html
index e4f18f9986c..e4f18f9986c 100644
--- a/src/servo/dom/bindings/codegen/test/test_sequence_wrapping.html
+++ b/src/components/servo/dom/bindings/codegen/test/test_sequence_wrapping.html
diff --git a/src/servo/dom/bindings/codegen/test/test_traceProtos.html b/src/components/servo/dom/bindings/codegen/test/test_traceProtos.html
index 195876744d6..195876744d6 100644
--- a/src/servo/dom/bindings/codegen/test/test_traceProtos.html
+++ b/src/components/servo/dom/bindings/codegen/test/test_traceProtos.html
diff --git a/src/servo/dom/bindings/conversions.rs b/src/components/servo/dom/bindings/conversions.rs
index 7350427a95e..7350427a95e 100644
--- a/src/servo/dom/bindings/conversions.rs
+++ b/src/components/servo/dom/bindings/conversions.rs
diff --git a/src/servo/dom/bindings/document.rs b/src/components/servo/dom/bindings/document.rs
index 4af2379500c..4af2379500c 100644
--- a/src/servo/dom/bindings/document.rs
+++ b/src/components/servo/dom/bindings/document.rs
diff --git a/src/servo/dom/bindings/domparser.rs b/src/components/servo/dom/bindings/domparser.rs
index 21744e43eb2..21744e43eb2 100644
--- a/src/servo/dom/bindings/domparser.rs
+++ b/src/components/servo/dom/bindings/domparser.rs
diff --git a/src/servo/dom/bindings/element.rs b/src/components/servo/dom/bindings/element.rs
index 4f568f15b5a..4f568f15b5a 100644
--- a/src/servo/dom/bindings/element.rs
+++ b/src/components/servo/dom/bindings/element.rs
diff --git a/src/servo/dom/bindings/event.rs b/src/components/servo/dom/bindings/event.rs
index b2af9b35e69..b2af9b35e69 100644
--- a/src/servo/dom/bindings/event.rs
+++ b/src/components/servo/dom/bindings/event.rs
diff --git a/src/servo/dom/bindings/eventtarget.rs b/src/components/servo/dom/bindings/eventtarget.rs
index 24242e7f9f4..24242e7f9f4 100644
--- a/src/servo/dom/bindings/eventtarget.rs
+++ b/src/components/servo/dom/bindings/eventtarget.rs
diff --git a/src/servo/dom/bindings/htmlcollection.rs b/src/components/servo/dom/bindings/htmlcollection.rs
index 175f0524b4c..175f0524b4c 100644
--- a/src/servo/dom/bindings/htmlcollection.rs
+++ b/src/components/servo/dom/bindings/htmlcollection.rs
diff --git a/src/servo/dom/bindings/node.rs b/src/components/servo/dom/bindings/node.rs
index 52bd80f382b..52bd80f382b 100644
--- a/src/servo/dom/bindings/node.rs
+++ b/src/components/servo/dom/bindings/node.rs
diff --git a/src/servo/dom/bindings/proxyhandler.rs b/src/components/servo/dom/bindings/proxyhandler.rs
index f073f54d8c1..f073f54d8c1 100644
--- a/src/servo/dom/bindings/proxyhandler.rs
+++ b/src/components/servo/dom/bindings/proxyhandler.rs
diff --git a/src/servo/dom/bindings/text.rs b/src/components/servo/dom/bindings/text.rs
index 41a4ece1c03..41a4ece1c03 100644
--- a/src/servo/dom/bindings/text.rs
+++ b/src/components/servo/dom/bindings/text.rs
diff --git a/src/servo/dom/bindings/utils.rs b/src/components/servo/dom/bindings/utils.rs
index d52af8760f2..d52af8760f2 100644
--- a/src/servo/dom/bindings/utils.rs
+++ b/src/components/servo/dom/bindings/utils.rs
diff --git a/src/servo/dom/bindings/window.rs b/src/components/servo/dom/bindings/window.rs
index 27d55ff1475..27d55ff1475 100644
--- a/src/servo/dom/bindings/window.rs
+++ b/src/components/servo/dom/bindings/window.rs
diff --git a/src/servo/dom/characterdata.rs b/src/components/servo/dom/characterdata.rs
index a8d81158d9c..a8d81158d9c 100644
--- a/src/servo/dom/characterdata.rs
+++ b/src/components/servo/dom/characterdata.rs
diff --git a/src/servo/dom/clientrect.rs b/src/components/servo/dom/clientrect.rs
index 3c9f6f9dca9..3c9f6f9dca9 100644
--- a/src/servo/dom/clientrect.rs
+++ b/src/components/servo/dom/clientrect.rs
diff --git a/src/servo/dom/clientrectlist.rs b/src/components/servo/dom/clientrectlist.rs
index ff48e6623be..ff48e6623be 100644
--- a/src/servo/dom/clientrectlist.rs
+++ b/src/components/servo/dom/clientrectlist.rs
diff --git a/src/servo/dom/document.rs b/src/components/servo/dom/document.rs
index 67c983346a3..67c983346a3 100644
--- a/src/servo/dom/document.rs
+++ b/src/components/servo/dom/document.rs
diff --git a/src/servo/dom/domparser.rs b/src/components/servo/dom/domparser.rs
index 6ab6655398f..6ab6655398f 100644
--- a/src/servo/dom/domparser.rs
+++ b/src/components/servo/dom/domparser.rs
diff --git a/src/servo/dom/element.rs b/src/components/servo/dom/element.rs
index f6c94bb3347..f6c94bb3347 100644
--- a/src/servo/dom/element.rs
+++ b/src/components/servo/dom/element.rs
diff --git a/src/servo/dom/event.rs b/src/components/servo/dom/event.rs
index 7b1fba2ac37..7b1fba2ac37 100644
--- a/src/servo/dom/event.rs
+++ b/src/components/servo/dom/event.rs
diff --git a/src/servo/dom/eventtarget.rs b/src/components/servo/dom/eventtarget.rs
index b216b7d0cca..b216b7d0cca 100644
--- a/src/servo/dom/eventtarget.rs
+++ b/src/components/servo/dom/eventtarget.rs
diff --git a/src/servo/dom/htmlcollection.rs b/src/components/servo/dom/htmlcollection.rs
index 0641987b341..0641987b341 100644
--- a/src/servo/dom/htmlcollection.rs
+++ b/src/components/servo/dom/htmlcollection.rs
diff --git a/src/servo/dom/node.rs b/src/components/servo/dom/node.rs
index 3c1ee3ba43f..3c1ee3ba43f 100644
--- a/src/servo/dom/node.rs
+++ b/src/components/servo/dom/node.rs
diff --git a/src/servo/dom/window.rs b/src/components/servo/dom/window.rs
index 7943f8b6bf8..7943f8b6bf8 100644
--- a/src/servo/dom/window.rs
+++ b/src/components/servo/dom/window.rs
diff --git a/src/servo/engine.rs b/src/components/servo/engine.rs
index ebf524c02cf..ebf524c02cf 100644
--- a/src/servo/engine.rs
+++ b/src/components/servo/engine.rs
diff --git a/src/servo/html/cssparse.rs b/src/components/servo/html/cssparse.rs
index 9ee789d6e3e..9ee789d6e3e 100644
--- a/src/servo/html/cssparse.rs
+++ b/src/components/servo/html/cssparse.rs
diff --git a/src/servo/html/hubbub_html_parser.rs b/src/components/servo/html/hubbub_html_parser.rs
index 549f6ec5b0a..549f6ec5b0a 100644
--- a/src/servo/html/hubbub_html_parser.rs
+++ b/src/components/servo/html/hubbub_html_parser.rs
diff --git a/src/servo/image.rs b/src/components/servo/image.rs
index d03b93b1a11..d03b93b1a11 100644
--- a/src/servo/image.rs
+++ b/src/components/servo/image.rs
diff --git a/src/servo/layout/aux.rs b/src/components/servo/layout/aux.rs
index f56f204e0d1..f56f204e0d1 100644
--- a/src/servo/layout/aux.rs
+++ b/src/components/servo/layout/aux.rs
diff --git a/src/servo/layout/block.rs b/src/components/servo/layout/block.rs
index d5479984f8d..d5479984f8d 100644
--- a/src/servo/layout/block.rs
+++ b/src/components/servo/layout/block.rs
diff --git a/src/servo/layout/box.rs b/src/components/servo/layout/box.rs
index 9cf69bdd7f0..da4cbc882db 100644
--- a/src/servo/layout/box.rs
+++ b/src/components/servo/layout/box.rs
@@ -14,6 +14,7 @@ use layout::text::TextBoxData;
 use layout::text;
 
 use core::cell::Cell;
+use core::cmp::ApproxEq;
 use core::managed;
 use geom::{Point2D, Rect, Size2D};
 use gfx::display_list::{DisplayItem, DisplayList};
@@ -30,7 +31,6 @@ use servo_net::image::holder::ImageHolder;
 use servo_net::local_image_cache::LocalImageCache;
 use servo_util::range::*;
 use std::arc;
-use core::cmp::ApproxEq;
 use std::net::url::Url;
 
 /// Render boxes (`struct RenderBox`) are the leaves of the layout tree. They cannot position
diff --git a/src/servo/layout/box_builder.rs b/src/components/servo/layout/box_builder.rs
index 12ad9aa199f..12ad9aa199f 100644
--- a/src/servo/layout/box_builder.rs
+++ b/src/components/servo/layout/box_builder.rs
diff --git a/src/servo/layout/context.rs b/src/components/servo/layout/context.rs
index 8646b9faabc..8646b9faabc 100644
--- a/src/servo/layout/context.rs
+++ b/src/components/servo/layout/context.rs
diff --git a/src/servo/layout/debug.rs b/src/components/servo/layout/debug.rs
index cbee6b8cf26..cbee6b8cf26 100644
--- a/src/servo/layout/debug.rs
+++ b/src/components/servo/layout/debug.rs
diff --git a/src/servo/layout/display_list_builder.rs b/src/components/servo/layout/display_list_builder.rs
index 1d0ea27b7e5..1d0ea27b7e5 100644
--- a/src/servo/layout/display_list_builder.rs
+++ b/src/components/servo/layout/display_list_builder.rs
diff --git a/src/servo/layout/flow.rs b/src/components/servo/layout/flow.rs
index 172cccc106a..3a1c7b3bb86 100644
--- a/src/servo/layout/flow.rs
+++ b/src/components/servo/layout/flow.rs
@@ -297,7 +297,7 @@ impl<'self> FlowContext {
         }
     }
 
-    pub fn iter_all_boxes(&self, cb: &fn(RenderBox) -> bool) {
+    pub fn iter_all_boxes(&self, cb: &fn(RenderBox) -> bool) -> bool {
         match *self {
             BlockFlow(block) => {
                 let block = &mut *block;
@@ -317,9 +317,12 @@ impl<'self> FlowContext {
             }
             _ => fail!(fmt!("Don't know how to iterate node's RenderBoxes for %?", self))
         }
+
+        true
     }
 
-    pub fn iter_boxes_for_node(&self, node: AbstractNode, callback: &fn(RenderBox) -> bool) {
+    pub fn iter_boxes_for_node(&self, node: AbstractNode, callback: &fn(RenderBox) -> bool)
+                               -> bool {
         for self.iter_all_boxes |box| {
             if box.node() == node {
                 if !callback(box) {
@@ -327,6 +330,8 @@ impl<'self> FlowContext {
                 }
             }
         }
+
+        true
     }
 }
 
diff --git a/src/servo/layout/inline.rs b/src/components/servo/layout/inline.rs
index b3cec67d5af..2bc621625f0 100644
--- a/src/servo/layout/inline.rs
+++ b/src/components/servo/layout/inline.rs
@@ -70,16 +70,31 @@ impl ElementMapping {
         self.entries.push(NodeRange::new(node, range))
     }
 
-    pub fn each(&self, cb: &fn(nr: &NodeRange) -> bool) {
-        do self.entries.each |nr| { cb(nr) }
+    pub fn each(&self, callback: &fn(nr: &NodeRange) -> bool) -> bool {
+        for self.entries.each |nr| {
+            if !callback(nr) {
+                break
+            }
+        }
+        true
     }
 
-    pub fn eachi(&self, cb: &fn(i: uint, nr: &NodeRange) -> bool) {
-        do self.entries.eachi |i, nr| { cb(i, nr) }
+    pub fn eachi(&self, callback: &fn(i: uint, nr: &NodeRange) -> bool) -> bool {
+        for self.entries.eachi |i, nr| {
+            if !callback(i, nr) {
+                break
+            }
+        }
+        true
     }
 
-    pub fn eachi_mut(&self, cb: &fn(i: uint, nr: &NodeRange) -> bool) {
-        do self.entries.eachi |i, nr| { cb(i, nr) }
+    pub fn eachi_mut(&self, callback: &fn(i: uint, nr: &NodeRange) -> bool) -> bool {
+        for self.entries.eachi |i, nr| {
+            if !callback(i, nr) {
+                break
+            }
+        }
+        true
     }
 
     pub fn repair_for_box_changes(&mut self, old_boxes: &[RenderBox], new_boxes: &[RenderBox]) {
@@ -178,22 +193,22 @@ impl TextRunScanner {
         debug!("TextRunScanner: scanning %u boxes for text runs...", inline.boxes.len());
 
         let mut out_boxes = ~[];
-        for uint::range(0, inline.boxes.len()) |box_i| {
-            debug!("TextRunScanner: considering box: %?", inline.boxes[box_i].debug_str());
-            if box_i > 0 && !can_coalesce_text_nodes(inline.boxes, box_i-1, box_i) {
-                self.flush_clump_to_list(ctx, flow, inline.boxes, &mut out_boxes);
+        for uint::range(0, flow.inline().boxes.len()) |box_i| {
+            debug!("TextRunScanner: considering box: %?", flow.inline().boxes[box_i].debug_str());
+            if box_i > 0 && !can_coalesce_text_nodes(flow.inline().boxes, box_i-1, box_i) {
+                self.flush_clump_to_list(ctx, flow, &mut out_boxes);
             }
             self.clump.extend_by(1);
         }
         // handle remaining clumps
         if self.clump.length() > 0 {
-            self.flush_clump_to_list(ctx, flow, inline.boxes, &mut out_boxes);
+            self.flush_clump_to_list(ctx, flow, &mut out_boxes);
         }
 
         debug!("TextRunScanner: swapping out boxes.");
 
         // Swap out the old and new box list of the flow.
-        inline.boxes = out_boxes;
+        flow.inline().boxes = out_boxes;
 
         // A helper function.
         fn can_coalesce_text_nodes(boxes: &[RenderBox], left_i: uint, right_i: uint) -> bool {
@@ -224,8 +239,10 @@ impl TextRunScanner {
     fn flush_clump_to_list(&mut self,
                            ctx: &mut LayoutContext, 
                            flow: FlowContext,
-                           in_boxes: &[RenderBox],
                            out_boxes: &mut ~[RenderBox]) {
+        let inline = &mut *flow.inline();
+        let in_boxes = &inline.boxes;
+
         assert!(self.clump.length() > 0);
 
         debug!("TextRunScanner: flushing boxes in range=%?", self.clump);
@@ -334,7 +351,7 @@ impl TextRunScanner {
         debug!("------------------");
 
         debug!("--- Elem ranges: ---");
-        for flow.inline().elems.eachi_mut |i: uint, nr: &NodeRange| {
+        for inline.elems.eachi_mut |i: uint, nr: &NodeRange| {
             debug!("%u: %? --> %s", i, nr.range, nr.node.debug_str()); ()
         }
         debug!("--------------------");
diff --git a/src/servo/layout/layout_task.rs b/src/components/servo/layout/layout_task.rs
index 13fd258e40b..13fd258e40b 100644
--- a/src/servo/layout/layout_task.rs
+++ b/src/components/servo/layout/layout_task.rs
diff --git a/src/servo/layout/text.rs b/src/components/servo/layout/text.rs
index 2bf2d49f0ac..2bf2d49f0ac 100644
--- a/src/servo/layout/text.rs
+++ b/src/components/servo/layout/text.rs
diff --git a/src/servo/macros.rs b/src/components/servo/macros.rs
index 8fe65bccfb6..8fe65bccfb6 100644
--- a/src/servo/macros.rs
+++ b/src/components/servo/macros.rs
diff --git a/src/servo/platform/common/glut_windowing.rs b/src/components/servo/platform/common/glut_windowing.rs
index b4ab82ac5d8..b4ab82ac5d8 100644
--- a/src/servo/platform/common/glut_windowing.rs
+++ b/src/components/servo/platform/common/glut_windowing.rs
diff --git a/src/servo/platform/common/shared_gl_windowing.rs b/src/components/servo/platform/common/shared_gl_windowing.rs
index a859696a75e..a859696a75e 100644
--- a/src/servo/platform/common/shared_gl_windowing.rs
+++ b/src/components/servo/platform/common/shared_gl_windowing.rs
diff --git a/src/servo/platform/mod.rs b/src/components/servo/platform/mod.rs
index fdbd3bf42d9..fdbd3bf42d9 100644
--- a/src/servo/platform/mod.rs
+++ b/src/components/servo/platform/mod.rs
diff --git a/src/servo/servo.rc b/src/components/servo/servo.rc
index 51b83b6a76a..51b83b6a76a 100755
--- a/src/servo/servo.rc
+++ b/src/components/servo/servo.rc
diff --git a/src/servo/util/mod.rs b/src/components/servo/util/mod.rs
index 3435959d46e..3435959d46e 100644
--- a/src/servo/util/mod.rs
+++ b/src/components/servo/util/mod.rs
diff --git a/src/servo/util/task.rs b/src/components/servo/util/task.rs
index bc36764a464..bc36764a464 100644
--- a/src/servo/util/task.rs
+++ b/src/components/servo/util/task.rs
diff --git a/src/servo/windowing.rs b/src/components/servo/windowing.rs
index bd7f0ce510f..bd7f0ce510f 100644
--- a/src/servo/windowing.rs
+++ b/src/components/servo/windowing.rs
diff --git a/src/patches/README b/src/etc/patches/README
index 63868fe4824..63868fe4824 100644
--- a/src/patches/README
+++ b/src/etc/patches/README
diff --git a/src/patches/mozjs-stack-bounds.diff b/src/etc/patches/mozjs-stack-bounds.diff
index 5f82df03dde..5f82df03dde 100644
--- a/src/patches/mozjs-stack-bounds.diff
+++ b/src/etc/patches/mozjs-stack-bounds.diff
diff --git a/src/libcss b/src/libcss
deleted file mode 160000
-Subproject 1b5d29808c55b375252668a90ab5255598f0e06
diff --git a/src/libhubbub b/src/libhubbub
deleted file mode 160000
-Subproject a784be39252e69f2f52bfaa8e1259c3904b7aa5
diff --git a/src/rust-fontconfig b/src/platform/linux/rust-fontconfig
-Subproject 7cb7a7aace99b17f99f15649377bb13a0dac9b6
+Subproject 7cb7a7aace99b17f99f15649377bb13a0dac9b6
diff --git a/src/platform/linux/rust-freetype b/src/platform/linux/rust-freetype
new file mode 160000
+Subproject 9224437bddb4bf2ce805e1f11ebaa8574572e32
diff --git a/src/platform/linux/rust-xlib b/src/platform/linux/rust-xlib
new file mode 160000
+Subproject 4c934355e4e3f6be53dafcbc547217649e368a5
diff --git a/src/platform/macos/rust-cocoa b/src/platform/macos/rust-cocoa
new file mode 160000
+Subproject 43d30dfc5db1a467b5dc64e889ce43fc82cd224
diff --git a/src/platform/macos/rust-core-foundation b/src/platform/macos/rust-core-foundation
new file mode 160000
+Subproject 2053bc421acbac9847905323dd1d28e4ce357ab
diff --git a/src/rust-core-graphics b/src/platform/macos/rust-core-graphics
-Subproject 3433fbda15cf2f16e00ff8103ae7652468a43a2
+Subproject 3433fbda15cf2f16e00ff8103ae7652468a43a2
diff --git a/src/platform/macos/rust-core-text b/src/platform/macos/rust-core-text
new file mode 160000
+Subproject e57128019bb804ec99ef1d6cebd57f5e6c221a3
diff --git a/src/rust-io-surface b/src/platform/macos/rust-io-surface
-Subproject f155846fe043f9060fa05be696c203180e7371f
+Subproject f155846fe043f9060fa05be696c203180e7371f
diff --git a/src/rust b/src/rust
deleted file mode 160000
-Subproject d546493096f35e68cbcd9b5d3d7654e7a934574
diff --git a/src/rust-azure b/src/rust-azure
deleted file mode 160000
-Subproject 62215bcc69f5593fb7dd1685ef795cb383e1e9d
diff --git a/src/rust-cocoa b/src/rust-cocoa
deleted file mode 160000
-Subproject 48cddf0880c5e19dcefd284980c744802bdc3c7
diff --git a/src/rust-core-foundation b/src/rust-core-foundation
deleted file mode 160000
-Subproject 5647befc43d4a2ea1f65e574d9138da40d39f7f
diff --git a/src/rust-core-text b/src/rust-core-text
deleted file mode 160000
-Subproject 98e2d7e3870759fe91c93ba520452a700fec875
diff --git a/src/rust-freetype b/src/rust-freetype
deleted file mode 160000
-Subproject c5364d91461c2f329feada422205b8326366fa3
diff --git a/src/rust-glut b/src/rust-glut
deleted file mode 160000
-Subproject aaa25872d7f6ba5eb4c61651f369d8d06e759d8
diff --git a/src/rust-hubbub b/src/rust-hubbub
deleted file mode 160000
-Subproject 2c1fb20490d14a5d714b6da64e6c60286f3be0d
diff --git a/src/rust-layers b/src/rust-layers
deleted file mode 160000
-Subproject ad98b667337bc13cb4c427c5d0b336d6c806b61
diff --git a/src/rust-netsurfcss b/src/rust-netsurfcss
deleted file mode 160000
-Subproject 2196fc2279bbc9c8b01f98eeff86fe9639e6b8e
diff --git a/src/rust-opengles b/src/rust-opengles
deleted file mode 160000
-Subproject 8215458cf05e9a8bc10a3af9b76aaef9e53397d
diff --git a/src/rust-wapcaplet b/src/rust-wapcaplet
deleted file mode 160000
-Subproject 25117a3559a7c5c793a5553d1b03f0f54a5f641
diff --git a/src/rust-xlib b/src/rust-xlib
deleted file mode 160000
-Subproject 0ac7b8dc20c4142ac6ad4500d7ae90c2bd3e742
diff --git a/src/support/azure/rust-azure b/src/support/azure/rust-azure
new file mode 160000
+Subproject f1ea3b16a8829d07853178ba5312176a8e854ef
diff --git a/src/rust-css b/src/support/css/rust-css
-Subproject 83ab48961487dc65d8921cc5ea829430e4e46f5
+Subproject 83ab48961487dc65d8921cc5ea829430e4e46f5
diff --git a/src/rust-geom b/src/support/geom/rust-geom
-Subproject 61f46e5035685e8e3d8b554db3b1e90c21d63fa
+Subproject 61f46e5035685e8e3d8b554db3b1e90c21d63fa
diff --git a/src/support/glut/rust-glut b/src/support/glut/rust-glut
new file mode 160000
+Subproject 6edd359ca41600e8c1ef9de198a578a04b2d625
diff --git a/src/rust-harfbuzz b/src/support/harfbuzz/rust-harfbuzz
-Subproject 56e106b9aa05f3a341397c0e116695fb8a82622
+Subproject 56e106b9aa05f3a341397c0e116695fb8a82622
diff --git a/src/rust-http-client b/src/support/http-client/rust-http-client
-Subproject 0b34d422ca51e4e17df76f96885287b3888974d
+Subproject 0b34d422ca51e4e17df76f96885287b3888974d
diff --git a/src/support/hubbub/libhubbub b/src/support/hubbub/libhubbub
new file mode 160000
+Subproject 1b06c674e794cea44e5e248f4738cb50268d8bc
diff --git a/src/support/hubbub/rust-hubbub b/src/support/hubbub/rust-hubbub
new file mode 160000
+Subproject ec3680a7cb5fae54d7d6bf323b8b6676d650b82
diff --git a/src/support/layers/rust-layers b/src/support/layers/rust-layers
new file mode 160000
+Subproject a0ddd23dbd59104cfde5911a043a73cda33dd81
diff --git a/src/libparserutils b/src/support/libparserutils/libparserutils
-Subproject 10a11900d78783655d500121d0afb2810785c02
+Subproject 10a11900d78783655d500121d0afb2810785c02
diff --git a/src/support/netsurfcss/libcss b/src/support/netsurfcss/libcss
new file mode 160000
+Subproject 18b768b6a786148d466f26c480ee35a7043d690
diff --git a/src/support/netsurfcss/rust-netsurfcss b/src/support/netsurfcss/rust-netsurfcss
new file mode 160000
+Subproject ef012c6b703510b6c7533d38d82a46dbf37759e
diff --git a/src/support/opengles/rust-opengles b/src/support/opengles/rust-opengles
new file mode 160000
+Subproject a27dc42bdcfec4b1fdca6581afe986e71c8de99
diff --git a/src/sharegl b/src/support/sharegl/sharegl
-Subproject f4e5d9421908e480b2120ed70ac33669b3add16
+Subproject f4e5d9421908e480b2120ed70ac33669b3add16
diff --git a/src/skia b/src/support/skia/skia
-Subproject 4af440519885bc45ed51349e9b501b1550f75d9
+Subproject 4af440519885bc45ed51349e9b501b1550f75d9
diff --git a/src/mozjs b/src/support/spidermonkey/mozjs
-Subproject 50f2e99633bf28f24b284821dbb723b38f2756e
+Subproject 50f2e99633bf28f24b284821dbb723b38f2756e
diff --git a/src/rust-mozjs b/src/support/spidermonkey/rust-mozjs
-Subproject f68fa6237754b9317cea7765de15a54ee832271
+Subproject f68fa6237754b9317cea7765de15a54ee832271
diff --git a/src/rust-stb-image b/src/support/stb-image/rust-stb-image
-Subproject 9f1107db8c670a77852938ffc8c36d52ccb4c32
+Subproject 9f1107db8c670a77852938ffc8c36d52ccb4c32
diff --git a/src/libwapcaplet b/src/support/wapcaplet/libwapcaplet
-Subproject 1c3343639571d65bc0c45cab8253dabe33aace9
+Subproject 1c3343639571d65bc0c45cab8253dabe33aace9
diff --git a/src/support/wapcaplet/rust-wapcaplet b/src/support/wapcaplet/rust-wapcaplet
new file mode 160000
+Subproject ead67f1ed72c82cfaeeb0ec1703b94d186078e5