Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #2356 : glennw/servo/warnings, r=jdm

Browse source
This commit is contained in:
bors-servo 2014-05-07 01:16:22 -04:00
commit c872764a7c
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/gfx/display_list.rs
View file

@ -97,7 +97,7 @@ impl StackingContext {
/// Creates a stacking context from a display list. /// Creates a stacking context from a display list.
fn new(list: DisplayList) -> StackingContext { fn new(list: DisplayList) -> StackingContext {
let DisplayList { let DisplayList {
list: mut list list: list
} = list; } = list;
let mut stacking_context = StackingContext { let mut stacking_context = StackingContext {
@ -161,7 +161,7 @@ impl StackingContext {
block_backgrounds_and_borders, block_backgrounds_and_borders,
floats, floats,
content, content,
positioned_descendants: mut positioned_descendants positioned_descendants: positioned_descendants
} = other; } = other;
let push = |destination: &mut DisplayList, source: DisplayList, level| { let push = |destination: &mut DisplayList, source: DisplayList, level| {

2
src/components/main/layout/flow.rs
View file

@ -577,7 +577,7 @@ impl Descendants {
/// Push the given descendants on to the existing descendants. /// Push the given descendants on to the existing descendants.
/// ///
/// Ignore any static y offsets, because they are None before layout. /// Ignore any static y offsets, because they are None before layout.
pub fn push_descendants(&mut self, mut given_descendants: Descendants) { pub fn push_descendants(&mut self, given_descendants: Descendants) {
for elem in given_descendants.descendant_links.move_iter() { for elem in given_descendants.descendant_links.move_iter() {
self.descendant_links.push(elem); self.descendant_links.push(elem);
} }

4
src/components/main/layout/inline.rs
View file

@ -1061,7 +1061,7 @@ impl FragmentMap {
/// necessary. /// necessary.
fn push_all(&mut self, other: FragmentMap, adjustment: uint) { fn push_all(&mut self, other: FragmentMap, adjustment: uint) {
let FragmentMap { let FragmentMap {
list: mut other_list list: other_list
} = other; } = other;
for other_range in other_list.move_iter() { for other_range in other_list.move_iter() {
@ -1101,7 +1101,7 @@ impl FragmentMap {
/// needlessly has to clone boxes. /// needlessly has to clone boxes.
pub fn fixup(&mut self, old_fragments: &[Box], new_fragments: &[Box]) { pub fn fixup(&mut self, old_fragments: &[Box], new_fragments: &[Box]) {
// TODO(pcwalton): Post Rust upgrade, use `with_capacity` here. // TODO(pcwalton): Post Rust upgrade, use `with_capacity` here.
let mut old_list = mem::replace(&mut self.list, Vec::new()); let old_list = mem::replace(&mut self.list, Vec::new());
let mut worklist = Vec::new(); // FIXME(#2269, pcwalton): was smallvec4 let mut worklist = Vec::new(); // FIXME(#2269, pcwalton): was smallvec4
let mut old_list_iter = old_list.move_iter().peekable(); let mut old_list_iter = old_list.move_iter().peekable();
let mut new_fragments_iter = new_fragments.iter().enumerate().peekable(); let mut new_fragments_iter = new_fragments.iter().enumerate().peekable();