bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Use a more precise lifetime

Browse source
This commit is contained in:
Oli Scherer 2024-06-18 09:28:20 +00:00
parent c1f62a7c35
commit 7e5893019c
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -996,7 +996,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
&self, &self,
err: &mut Diag<'_>, err: &mut Diag<'_>,
ty: Ty<'tcx>, ty: Ty<'tcx>,
expr: &'cx hir::Expr<'cx>, expr: &hir::Expr<'_>,
) { ) {
let typeck_results = self.infcx.tcx.typeck(self.mir_def_id()); let typeck_results = self.infcx.tcx.typeck(self.mir_def_id());
let hir::ExprKind::Struct(struct_qpath, fields, Some(base)) = expr.kind else { return }; let hir::ExprKind::Struct(struct_qpath, fields, Some(base)) = expr.kind else { return };
@ -1084,8 +1084,8 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
&self, &self,
err: &mut Diag<'_>, err: &mut Diag<'_>,
ty: Ty<'tcx>, ty: Ty<'tcx>,
mut expr: &'cx hir::Expr<'cx>, mut expr: &'tcx hir::Expr<'tcx>,
mut other_expr: Option<&'cx hir::Expr<'cx>>, mut other_expr: Option<&'tcx hir::Expr<'tcx>>,
use_spans: Option<UseSpans<'tcx>>, use_spans: Option<UseSpans<'tcx>>,
) { ) {
if let hir::ExprKind::Struct(_, _, Some(_)) = expr.kind { if let hir::ExprKind::Struct(_, _, Some(_)) = expr.kind {
@ -2016,7 +2016,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
); );
} }
pub(crate) fn find_expr(&self, span: Span) -> Option<&hir::Expr<'_>> { pub(crate) fn find_expr(&self, span: Span) -> Option<&'tcx hir::Expr<'tcx>> {
let tcx = self.infcx.tcx; let tcx = self.infcx.tcx;
let body_id = tcx.hir_node(self.mir_hir_id()).body_id()?; let body_id = tcx.hir_node(self.mir_hir_id()).body_id()?;
let mut expr_finder = FindExprBySpan::new(span, tcx); let mut expr_finder = FindExprBySpan::new(span, tcx);