New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix the build for NLL #21356
Merged
+37
−32
Merged
Fix the build for NLL #21356
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.
Loading status checks…
Fix the build for NLL
Test with `RUSTFLAGS="-Zborrowck=mir -Ztwo-phase-borrows" cargo build` https://internals.rust-lang.org/t/help-us-get-non-lexical-lifetimes-nll-over-the-finish-line/7807/7
- Loading branch information
commit 1333b6ee4513926fa192d438d16771922ce047a9
Some generated files are not rendered by default. Learn more.
Oops, something went wrong.
| @@ -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( | ||
| self.column_computed_inline_sizes[index].size.0 as f32 / total_minimum_size); | ||
SimonSapin
Author
Member
|
||
| remaining_inline_size.scale_by(inline_size 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 mut style in iter { | ||
| for style in iter { | ||
SimonSapin
Author
Member
|
||
| 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 mut rowgroup = kid.as_table_rowgroup(); | ||
| let 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 mut rowgroup = kid.as_mut_table_rowgroup(); | ||
| let 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() | ||
ProTip!
Use n and p to navigate between commits in a pull request.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
This looks a bit like a regression doesn't it?