Skip to content

Commit

Permalink
Fix nits; warning police
Browse files Browse the repository at this point in the history
  • Loading branch information
Eric Atkinson committed Aug 20, 2013
1 parent 9b08fd8 commit 5e3ff91
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/components/main/layout/aux.rs
Expand Up @@ -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 },
}
}
}
Expand Down
1 change: 0 additions & 1 deletion src/components/main/layout/box.rs
Expand Up @@ -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;

Expand Down
5 changes: 2 additions & 3 deletions src/components/main/layout/box_builder.rs
Expand Up @@ -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 {
Expand Down Expand Up @@ -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())
}
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/components/main/layout/float.rs
Expand Up @@ -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};

Expand Down
1 change: 0 additions & 1 deletion src/components/main/layout/layout_task.rs
Expand Up @@ -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;
Expand Down

5 comments on commit 5e3ff91

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from metajack
at eric93@5e3ff91

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging eric93/servo/parallel-layout-ownedtree = 5e3ff91 into auto

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

eric93/servo/parallel-layout-ownedtree = 5e3ff91 merged ok, testing candidate = abccd82

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = abccd82

Please sign in to comment.