Skip to content

Commit 7c353c0

Browse files
committed
Auto merge of #117908 - lcnr:region-kind-rename, r=BoxyUwU
finish `RegionKind` renaming second step of rust-lang/types-team#95 continues the work from #117876. While working on this and I encountered a bunch of further cleanup which I'll either open a tracking issue for or will do in a separate PR: - rewrite the `RegionKind` docs, they still talk about `ReEmpty` and are generally out of date - rename `DescriptionCtx` to `DescriptionCtxt` - what is `CheckRegions::Bound`? - `collect_late_bound_regions` et al - `erase_late_bound_regions` -> `instantiate_bound_regions_with_erased`? - `EraseEarlyRegions` visitor should be removed, feels duplicate r? `@BoxyUwU`
2 parents e635fcb + c5d8f55 commit 7c353c0

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

clippy_lints/src/pass_by_ref_or_value.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ impl<'tcx> PassByRefOrValue {
175175
},
176176
// Early bound regions on functions are either from the containing item, are bounded by another
177177
// lifetime, or are used as a bound for a type or lifetime.
178-
RegionKind::ReEarlyBound(..) => continue,
178+
RegionKind::ReEarlyParam(..) => continue,
179179
_ => (),
180180
}
181181

clippy_lints/src/ptr.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -465,9 +465,9 @@ fn check_fn_args<'cx, 'tcx: 'cx>(
465465
.walk()
466466
.filter_map(|arg| {
467467
arg.as_region().and_then(|lifetime| match lifetime.kind() {
468-
ty::ReEarlyBound(r) => Some(r.def_id),
468+
ty::ReEarlyParam(r) => Some(r.def_id),
469469
ty::ReBound(_, r) => r.kind.get_id(),
470-
ty::ReFree(r) => r.bound_region.get_id(),
470+
ty::ReLateParam(r) => r.bound_region.get_id(),
471471
ty::ReStatic
472472
| ty::ReVar(_)
473473
| ty::RePlaceholder(_)

0 commit comments

Comments
 (0)