aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout
diff options
context:
space:
mode:
authorJosh Matthews <josh@joshmatthews.net>2018-08-07 20:24:55 -0400
committerJosh Matthews <josh@joshmatthews.net>2018-08-07 20:24:55 -0400
commit7c32ad7c3d13f1e44b05beab937549ba18b48584 (patch)
tree2170914966749ed39f0b2b15f91b1dcfd2df4226 /components/layout
parentd1733aa5029c5b97390a236d94eed916ddb64577 (diff)
downloadservo-7c32ad7c3d13f1e44b05beab937549ba18b48584.tar.gz
servo-7c32ad7c3d13f1e44b05beab937549ba18b48584.zip
Revert "Fix the build for NLL"
This reverts commit d1733aa5029c5b97390a236d94eed916ddb64577.
Diffstat (limited to 'components/layout')
-rw-r--r--components/layout/table.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/components/layout/table.rs b/components/layout/table.rs
index e36fd4b4e5a..658a39d8e21 100644
--- a/components/layout/table.rs
+++ b/components/layout/table.rs
@@ -448,9 +448,9 @@ impl Flow for TableFlow {
.sum::<f32>();
for &index in &constrained_column_inline_sizes_indices {
- let inline_size = self.column_computed_inline_sizes[index].size.0;
self.column_computed_inline_sizes[index].size +=
- remaining_inline_size.scale_by(inline_size as f32 / total_minimum_size);
+ remaining_inline_size.scale_by(
+ self.column_computed_inline_sizes[index].size.0 as f32 / total_minimum_size);
}
}
}
@@ -531,7 +531,7 @@ impl Flow for TableFlow {
self.block_flow.build_display_list_for_block(state, border_painting_mode);
let iter = TableCellStyleIterator::new(&self);
- for style in iter {
+ for mut style in iter {
style.build_display_list(state)
}
}
@@ -964,7 +964,7 @@ impl<'a> Iterator for TableRowAndGroupIterator<'a> {
match self.kids.next() {
Some(kid) => {
if kid.is_table_rowgroup() {
- let rowgroup = kid.as_table_rowgroup();
+ let mut rowgroup = kid.as_table_rowgroup();
let iter = rowgroup.block_flow.base.child_iter();
self.group = Some((&rowgroup.block_flow.fragment, iter));
self.next()
@@ -1010,7 +1010,7 @@ impl<'a> Iterator for MutTableRowAndGroupIterator<'a> {
match self.kids.next() {
Some(kid) => {
if kid.is_table_rowgroup() {
- let rowgroup = kid.as_mut_table_rowgroup();
+ let mut rowgroup = kid.as_mut_table_rowgroup();
let iter = rowgroup.block_flow.base.child_iter_mut();
self.group = Some((&rowgroup.block_flow.fragment, iter));
self.next()