From 5e3ff91a2d5672de99c481e5634f348612210e7d Mon Sep 17 00:00:00 2001
From: Eric Atkinson <eatkinson@mozilla.com>
Date: Tue, 20 Aug 2013 11:47:50 -0700
Subject: [PATCH] Fix nits; warning police

---
 src/components/main/layout/aux.rs         | 2 +-
 src/components/main/layout/box.rs         | 1 -
 src/components/main/layout/box_builder.rs | 5 ++---
 src/components/main/layout/float.rs       | 2 +-
 src/components/main/layout/layout_task.rs | 1 -
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/components/main/layout/aux.rs b/src/components/main/layout/aux.rs
index 4f1968021efd..f891ce033895 100644
--- a/src/components/main/layout/aux.rs
+++ b/src/components/main/layout/aux.rs
@@ -37,7 +37,7 @@ impl LayoutData {
         LayoutData {
             style: None,
             restyle_damage: None,
-            boxes: DisplayBoxes{ display_list: None, range: None },
+            boxes: DisplayBoxes { display_list: None, range: None },
         }
     }
 }
diff --git a/src/components/main/layout/box.rs b/src/components/main/layout/box.rs
index 8812e0b906f0..2d30a2d584b6 100644
--- a/src/components/main/layout/box.rs
+++ b/src/components/main/layout/box.rs
@@ -8,7 +8,6 @@ use css::node_style::StyledNode;
 use layout::context::LayoutContext;
 use layout::display_list_builder::{DisplayListBuilder, ExtraDisplayListData, ToGfxColor};
 use layout::float_context::{ClearType, ClearLeft, ClearRight, ClearBoth};
-use layout::flow::FlowContext;
 use layout::model::{BoxModel, MaybeAuto};
 use layout::text;
 
diff --git a/src/components/main/layout/box_builder.rs b/src/components/main/layout/box_builder.rs
index 89486d76cb93..3e3f5a6c25bd 100644
--- a/src/components/main/layout/box_builder.rs
+++ b/src/components/main/layout/box_builder.rs
@@ -30,7 +30,6 @@ use script::dom::node::{AbstractNode, CommentNodeTypeId, DoctypeNodeTypeId};
 use script::dom::node::{ElementNodeTypeId, LayoutView, TextNodeTypeId};
 use servo_util::range::Range;
 use servo_util::tree::{TreeNodeRef, TreeNode};
-use std::util;
 use std::cell::Cell;
 
 pub struct LayoutTreeBuilder {
@@ -481,7 +480,7 @@ impl LayoutTreeBuilder {
                               ty: FlowContextType)
                               -> BoxGenerator<'a> {
 
-        let mut new_flow = self.make_flow(ty, node);
+        let new_flow = self.make_flow(ty, node);
         parent_generator.flow.add_new_child(new_flow);
         BoxGenerator::new(parent_generator.flow.last_child().unwrap())
     }
@@ -590,7 +589,7 @@ impl LayoutTreeBuilder {
 
         let mut new_flow = self.make_flow(Flow_Root, root);
         {
-            let mut new_generator = BoxGenerator::new(&mut new_flow);
+            let new_generator = BoxGenerator::new(&mut new_flow);
             self.construct_recursively(layout_ctx, root, new_generator, None);
         }
         return Ok(new_flow)
diff --git a/src/components/main/layout/float.rs b/src/components/main/layout/float.rs
index 068acc9cb4cc..d56f8a8269b4 100644
--- a/src/components/main/layout/float.rs
+++ b/src/components/main/layout/float.rs
@@ -5,7 +5,7 @@
 use layout::box::{RenderBox};
 use layout::context::LayoutContext;
 use layout::display_list_builder::{DisplayListBuilder, ExtraDisplayListData};
-use layout::flow::{FloatFlow, FlowData};
+use layout::flow::{FlowData};
 use layout::model::{MaybeAuto};
 use layout::float_context::{FloatContext, PlacementInfo, FloatType};
 
diff --git a/src/components/main/layout/layout_task.rs b/src/components/main/layout/layout_task.rs
index 2ef487b50df7..ee9ce45de6e0 100644
--- a/src/components/main/layout/layout_task.rs
+++ b/src/components/main/layout/layout_task.rs
@@ -16,7 +16,6 @@ use layout::incremental::{RestyleDamage, BubbleWidths};
 
 use std::cast::transmute;
 use std::cell::Cell;
-use std::uint;
 use std::comm::{Port};
 use extra::arc::Arc;
 use geom::point::Point2D;