mirror of
https://github.com/servo/servo.git
synced 2025-08-05 13:40:08 +01:00
auto merge of #2356 : glennw/servo/warnings, r=jdm
This commit is contained in:
commit
c872764a7c
3 changed files with 5 additions and 5 deletions
|
@ -97,7 +97,7 @@ impl StackingContext {
|
|||
/// Creates a stacking context from a display list.
|
||||
fn new(list: DisplayList) -> StackingContext {
|
||||
let DisplayList {
|
||||
list: mut list
|
||||
list: list
|
||||
} = list;
|
||||
|
||||
let mut stacking_context = StackingContext {
|
||||
|
@ -161,7 +161,7 @@ impl StackingContext {
|
|||
block_backgrounds_and_borders,
|
||||
floats,
|
||||
content,
|
||||
positioned_descendants: mut positioned_descendants
|
||||
positioned_descendants: positioned_descendants
|
||||
} = other;
|
||||
|
||||
let push = |destination: &mut DisplayList, source: DisplayList, level| {
|
||||
|
|
|
@ -577,7 +577,7 @@ impl Descendants {
|
|||
/// Push the given descendants on to the existing descendants.
|
||||
///
|
||||
/// 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() {
|
||||
self.descendant_links.push(elem);
|
||||
}
|
||||
|
|
|
@ -1061,7 +1061,7 @@ impl FragmentMap {
|
|||
/// necessary.
|
||||
fn push_all(&mut self, other: FragmentMap, adjustment: uint) {
|
||||
let FragmentMap {
|
||||
list: mut other_list
|
||||
list: other_list
|
||||
} = other;
|
||||
|
||||
for other_range in other_list.move_iter() {
|
||||
|
@ -1101,7 +1101,7 @@ impl FragmentMap {
|
|||
/// needlessly has to clone boxes.
|
||||
pub fn fixup(&mut self, old_fragments: &[Box], new_fragments: &[Box]) {
|
||||
// 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 old_list_iter = old_list.move_iter().peekable();
|
||||
let mut new_fragments_iter = new_fragments.iter().enumerate().peekable();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue