bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Account for macros when suggesting a new let binding

Browse source
This commit is contained in:
Esteban Küber 2023-07-28 14:44:03 +00:00
parent 49a16b64b0
commit 66d23793f0
4 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs
View file

@ -2133,13 +2133,14 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
self.current -= 1;
}
fn visit_expr(&mut self, expr: &hir::Expr<'tcx>) {
if self.span == expr.span {
if self.span == expr.span.source_callsite() {
self.found = self.current;
}
walk_expr(self, expr);
}
}
let source_info = self.body.source_info(location);
let proper_span = proper_span.source_callsite();
if let Some(scope) = self.body.source_scopes.get(source_info.scope)
&& let ClearCrossCrate::Set(scope_data) = &scope.local_data
&& let Some(node) = self.infcx.tcx.hir().find(scope_data.lint_root)