about summary refs log tree commit diff
path: root/compiler/rustc_borrowck
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2022-07-27 17:55:07 +0200
committerGitHub <noreply@github.com>2022-07-27 17:55:07 +0200
commitc37ee1a7e04419bf91a280357bfbb950d99512b3 (patch)
tree69357e651fe65c3e40fe9899aad8e06746b399a4 /compiler/rustc_borrowck
parenta7f4eb995589283d5729e6a99f578da9ab043988 (diff)
parent4b2f06b8a91fde63a744c4b297030893d4a92c92 (diff)
downloadrust-c37ee1a7e04419bf91a280357bfbb950d99512b3.tar.gz
rust-c37ee1a7e04419bf91a280357bfbb950d99512b3.zip
Rollup merge of #99728 - cjgillot:ast-lifetimes-anon-clean, r=petrochenkov
Clean up HIR-based lifetime resolution

Based on https://github.com/rust-lang/rust/pull/97313.

Fixes #98932.

r? `@petrochenkov`
Diffstat (limited to 'compiler/rustc_borrowck')
-rw-r--r--compiler/rustc_borrowck/src/diagnostics/region_name.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/rustc_borrowck/src/diagnostics/region_name.rs b/compiler/rustc_borrowck/src/diagnostics/region_name.rs
index 4cf1ac4d7ab..0662d4d882f 100644
--- a/compiler/rustc_borrowck/src/diagnostics/region_name.rs
+++ b/compiler/rustc_borrowck/src/diagnostics/region_name.rs
@@ -589,8 +589,7 @@ impl<'tcx> MirBorrowckCtxt<'_, 'tcx> {
 
             hir::LifetimeName::Param(_, hir::ParamName::Fresh)
             | hir::LifetimeName::ImplicitObjectLifetimeDefault
-            | hir::LifetimeName::Implicit
-            | hir::LifetimeName::Underscore => {
+            | hir::LifetimeName::Infer => {
                 // In this case, the user left off the lifetime; so
                 // they wrote something like:
                 //