bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Fix rebase

Browse source
This commit is contained in:
Esteban Küber 2022-07-15 11:07:20 -07:00
parent 3e5809d94f
commit 3ee4e5f704
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,7 +7,7 @@ use rustc_errors::{
}; };
use rustc_hir as hir; use rustc_hir as hir;
use rustc_hir::def_id::DefId; use rustc_hir::def_id::DefId;
use rustc_hir::intravisit::{walk_expr, Visitor}; use rustc_hir::intravisit::{walk_block, walk_expr, Visitor};
use rustc_hir::{AsyncGeneratorKind, GeneratorKind}; use rustc_hir::{AsyncGeneratorKind, GeneratorKind};
use rustc_infer::infer::TyCtxtInferExt; use rustc_infer::infer::TyCtxtInferExt;
use rustc_infer::traits::ObligationCause; use rustc_infer::traits::ObligationCause;
@ -1504,8 +1504,6 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
let mut suggested = false; let mut suggested = false;
let msg = "consider using a `let` binding to create a longer lived value"; let msg = "consider using a `let` binding to create a longer lived value";
use rustc_hir::intravisit::Visitor;
/// We check that there's a single level of block nesting to ensure always correct /// We check that there's a single level of block nesting to ensure always correct
/// suggestions. If we don't, then we only provide a free-form message to avoid /// suggestions. If we don't, then we only provide a free-form message to avoid
/// misleading users in cases like `src/test/ui/nll/borrowed-temporary-error.rs`. /// misleading users in cases like `src/test/ui/nll/borrowed-temporary-error.rs`.
@ -1520,14 +1518,14 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
impl<'tcx> Visitor<'tcx> for NestedStatementVisitor { impl<'tcx> Visitor<'tcx> for NestedStatementVisitor {
fn visit_block(&mut self, block: &hir::Block<'tcx>) { fn visit_block(&mut self, block: &hir::Block<'tcx>) {
self.current += 1; self.current += 1;
rustc_hir::intravisit::walk_block(self, block); walk_block(self, block);
self.current -= 1; self.current -= 1;
} }
fn visit_expr(&mut self, expr: &hir::Expr<'tcx>) { fn visit_expr(&mut self, expr: &hir::Expr<'tcx>) {
if self.span == expr.span { if self.span == expr.span {
self.found = self.current; self.found = self.current;
} }
rustc_hir::intravisit::walk_expr(self, expr); walk_expr(self, expr);
} }
} }
let source_info = self.body.source_info(location); let source_info = self.body.source_info(location);