Skip to content

Rollup of 3 pull requests #91247

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.

Sign up for GitHub

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

Closed
matthiaskrgr wants to merge 7 commits into from
Closed

Rollup of 3 pull requests #91247

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
870b831
Feat: make cg_ssa get_param borrow the builder mutable
RDambrosio016 Nov 24, 2021
c981d40
Fix invalid scrollbar display on source code page
GuillaumeGomez Nov 25, 2021
718a3b1
Fix issue 91206
compiler-errors Nov 25, 2021
69d1917
Add test demonstrating no more ICE
compiler-errors Nov 25, 2021
82e24e9
Rollup merge of #91169 - RDambrosio016:master, r=bjorn3
matthiaskrgr Nov 26, 2021
7690946
Rollup merge of #91212 - compiler-errors:issue91206, r=oli-obk
matthiaskrgr Nov 26, 2021
caf7614
Rollup merge of #91225 - GuillaumeGomez:source-page-scrollbar, r=jsha
matthiaskrgr Nov 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix issue 91206
  • Loading branch information
@compiler-errors
compiler-errors committed Nov 25, 2021
commit 718a3b1f2d59943c90cd02b9d0b90b315e003ec0
24 changes: 14 additions & 10 deletions compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,16 +447,20 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
// check if the RHS is from desugaring
let opt_assignment_rhs_span =
self.body.find_assignments(local).first().map(|&location| {
let stmt = &self.body[location.block].statements
[location.statement_index];
match stmt.kind {
mir::StatementKind::Assign(box (
_,
mir::Rvalue::Use(mir::Operand::Copy(place)),
)) => {
self.body.local_decls[place.local].source_info.span
}
_ => self.body.source_info(location).span,
if let Some(mir::Statement {
source_info: _,
kind:
mir::StatementKind::Assign(box (
_,
mir::Rvalue::Use(mir::Operand::Copy(place)),
)),
}) = self.body[location.block]
.statements
.get(location.statement_index)
{
self.body.local_decls[place.local].source_info.span
} else {
self.body.source_info(location).span
}
});
match opt_assignment_rhs_span.and_then(|s| s.desugaring_kind()) {
Expand Down