diff --git a/components/layout/construct.rs b/components/layout/construct.rs
index bf427dfbf99..6f8ef66edf6 100644
--- a/components/layout/construct.rs
+++ b/components/layout/construct.rs
@@ -92,8 +92,8 @@ impl ConstructionResult {
 
     pub fn debug_id(&self) -> usize {
         match self {
-            &ConstructionResult::None => 0u,
-            &ConstructionResult::ConstructionItem(_) => 0u,
+            &ConstructionResult::None => 0,
+            &ConstructionResult::ConstructionItem(_) => 0,
             &ConstructionResult::Flow(ref flow_ref, _) => flow::base(&**flow_ref).debug_id(),
         }
     }
diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs
index 9fe2b97eb00..b1f43a26c86 100644
--- a/components/layout/fragment.rs
+++ b/components/layout/fragment.rs
@@ -1601,7 +1601,7 @@ impl Fragment {
             let inline_end_fragment_text =
                 text_fragment_info.run.text.slice_chars(inline_end_range.begin().to_usize(),
                                                         inline_end_range.end().to_usize());
-            let mut leading_whitespace_character_count = 0i;
+            let mut leading_whitespace_character_count = 0;
             for ch in inline_end_fragment_text.chars() {
                 if ch.is_whitespace() {
                     leading_whitespace_character_count += 1
@@ -2128,7 +2128,7 @@ pub enum CoordinateSystem {
 fn strip_trailing_whitespace(text_run: &TextRun, range: &mut Range<CharIndex>) -> bool {
     // FIXME(pcwalton): Is there a more clever (i.e. faster) way to do this?
     let text = text_run.text.slice_chars(range.begin().to_usize(), range.end().to_usize());
-    let mut trailing_whitespace_character_count = 0i;
+    let mut trailing_whitespace_character_count = 0;
     for ch in text.chars().rev() {
         if ch.is_whitespace() {
             trailing_whitespace_character_count += 1
diff --git a/components/layout/lib.rs b/components/layout/lib.rs
index 646daab0480..631844dd67c 100644
--- a/components/layout/lib.rs
+++ b/components/layout/lib.rs
@@ -6,7 +6,6 @@
 #![feature(box_syntax)]
 #![feature(collections)]
 #![feature(core)]
-#![feature(int_uint)]
 #![feature(io)]
 #![feature(plugin)]
 #![feature(rustc_private)]
diff --git a/components/layout/traversal.rs b/components/layout/traversal.rs
index 72c1ade2062..5fe8ec3e66d 100644
--- a/components/layout/traversal.rs
+++ b/components/layout/traversal.rs
@@ -104,7 +104,7 @@ fn insert_ancestors_into_bloom_filter(bf: &mut Box<BloomFilter>,
                                       mut n: LayoutNode,
                                       layout_context: &LayoutContext) {
     debug!("[{}] Inserting ancestors.", tid());
-    let mut ancestors = 0u;
+    let mut ancestors = 0;
     loop {
         ancestors += 1;