aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout/construct.rs
diff options
context:
space:
mode:
authorSimon Sapin <simon.sapin@exyr.org>2017-08-11 16:24:21 +0200
committerSimon Sapin <simon.sapin@exyr.org>2017-08-15 14:10:44 +0200
commitb5a4b8d6a09a71bd3a4ff4ae68e7a9639f9dcaad (patch)
tree6f19f8562d57258c06ee21ee2bdbd85f9ae2cb64 /components/layout/construct.rs
parent41fb10c58995781d595a233afae0758427ad5cc5 (diff)
downloadservo-b5a4b8d6a09a71bd3a4ff4ae68e7a9639f9dcaad.tar.gz
servo-b5a4b8d6a09a71bd3a4ff4ae68e7a9639f9dcaad.zip
Upgrade to rustc 1.21.0-nightly (13d94d5fa 2017-08-10)
Diffstat (limited to 'components/layout/construct.rs')
-rw-r--r--components/layout/construct.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/components/layout/construct.rs b/components/layout/construct.rs
index c1643c9f92c..7e49784479c 100644
--- a/components/layout/construct.rs
+++ b/components/layout/construct.rs
@@ -1921,7 +1921,7 @@ impl Legalizer {
/// true for anonymous block children of flex flows.
fn try_to_add_child(&mut self, context: &SharedStyleContext, parent: &mut FlowRef, child: &mut FlowRef)
-> bool {
- let mut parent = self.stack.last_mut().unwrap_or(parent);
+ let parent = self.stack.last_mut().unwrap_or(parent);
let (parent_class, child_class) = (parent.class(), child.class());
match (parent_class, child_class) {
(FlowClass::TableWrapper, FlowClass::Table) |
@@ -1962,7 +1962,7 @@ impl Legalizer {
} else {
IS_BLOCK_FLEX_ITEM
};
- let mut block = FlowRef::deref_mut(&mut block_wrapper).as_mut_block();
+ let block = FlowRef::deref_mut(&mut block_wrapper).as_mut_block();
block.base.flags.insert(MARGINS_CANNOT_COLLAPSE);
block.fragment.flags.insert(flag);
}
@@ -1979,7 +1979,7 @@ impl Legalizer {
} else {
IS_BLOCK_FLEX_ITEM
};
- let mut block = FlowRef::deref_mut(child).as_mut_block();
+ let block = FlowRef::deref_mut(child).as_mut_block();
block.base.flags.insert(MARGINS_CANNOT_COLLAPSE);
block.fragment.flags.insert(flag);
}