diff options
| author | Michael Goulet <michael@errs.io> | 2023-02-06 18:38:52 +0000 |
|---|---|---|
| committer | Michael Goulet <michael@errs.io> | 2023-02-16 03:39:59 +0000 |
| commit | eff2cb7760ffd1ed06fd5a68ba04dcb6689106f6 (patch) | |
| tree | be03b0f70bbf8f87d2ba0ea640edf25ea09a3b98 /compiler/rustc_hir_analysis/src/collect/generics_of.rs | |
| parent | 262a344d7245f242586d5d5a0cc5c892f45891c4 (diff) | |
| download | rust-eff2cb7760ffd1ed06fd5a68ba04dcb6689106f6.tar.gz rust-eff2cb7760ffd1ed06fd5a68ba04dcb6689106f6.zip | |
Rename some region-specific stuff
Diffstat (limited to 'compiler/rustc_hir_analysis/src/collect/generics_of.rs')
| -rw-r--r-- | compiler/rustc_hir_analysis/src/collect/generics_of.rs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/compiler/rustc_hir_analysis/src/collect/generics_of.rs b/compiler/rustc_hir_analysis/src/collect/generics_of.rs index 014ee9fcc20..7bcaeadbcf6 100644 --- a/compiler/rustc_hir_analysis/src/collect/generics_of.rs +++ b/compiler/rustc_hir_analysis/src/collect/generics_of.rs @@ -1,4 +1,4 @@ -use crate::middle::resolve_lifetime as rl; +use crate::middle::resolve_bound_vars as rbv; use hir::{ intravisit::{self, Visitor}, GenericParamKind, HirId, Node, @@ -394,10 +394,11 @@ fn has_late_bound_regions<'tcx>(tcx: TyCtxt<'tcx>, node: Node<'tcx>) -> Option<S return; } - match self.tcx.named_region(lt.hir_id) { - Some(rl::Region::Static | rl::Region::EarlyBound(..)) => {} - Some(rl::Region::LateBound(debruijn, _, _)) if debruijn < self.outer_index => {} - Some(rl::Region::LateBound(..) | rl::Region::Free(..)) | None => { + match self.tcx.named_bound_var(lt.hir_id) { + Some(rbv::ResolvedArg::StaticLifetime | rbv::ResolvedArg::EarlyBound(..)) => {} + Some(rbv::ResolvedArg::LateBound(debruijn, _, _)) + if debruijn < self.outer_index => {} + Some(rbv::ResolvedArg::LateBound(..) | rbv::ResolvedArg::Free(..)) | None => { self.has_late_bound_regions = Some(lt.ident.span); } } |
