Skip to content

Commit 8a776ee

Browse files
committed
rename arguments to highlight_if_we_can_match_hir_ty
1 parent ebb4aba commit 8a776ee

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

src/librustc_mir/borrow_check/diagnostics/region_name.rs

+6-7
Original file line numberDiff line numberDiff line change
@@ -420,9 +420,9 @@ impl<'tcx> MirBorrowckCtxt<'_, 'tcx> {
420420
/// | - let's call the lifetime of this reference `'1`
421421
/// ```
422422
///
423-
/// the way this works is that we match up `argument_ty`, which is
423+
/// the way this works is that we match up `ty`, which is
424424
/// a `Ty<'tcx>` (the internal form of the type) with
425-
/// `argument_hir_ty`, a `hir::Ty` (the syntax of the type
425+
/// `hir_ty`, a `hir::Ty` (the syntax of the type
426426
/// annotation). We are descending through the types stepwise,
427427
/// looking in to find the region `needle_fr` in the internal
428428
/// type. Once we find that, we can use the span of the `hir::Ty`
@@ -435,15 +435,14 @@ impl<'tcx> MirBorrowckCtxt<'_, 'tcx> {
435435
fn highlight_if_we_can_match_hir_ty(
436436
&self,
437437
needle_fr: RegionVid,
438-
argument_ty: Ty<'tcx>,
439-
argument_hir_ty: &hir::Ty<'_>,
438+
ty: Ty<'tcx>,
439+
hir_ty: &hir::Ty<'_>,
440440
) -> Option<RegionNameHighlight> {
441-
let search_stack: &mut Vec<(Ty<'tcx>, &hir::Ty<'_>)> =
442-
&mut vec![(argument_ty, argument_hir_ty)];
441+
let search_stack: &mut Vec<(Ty<'tcx>, &hir::Ty<'_>)> = &mut vec![(ty, hir_ty)];
443442

444443
while let Some((ty, hir_ty)) = search_stack.pop() {
445444
match (&ty.kind, &hir_ty.kind) {
446-
// Check if the `argument_ty` is `&'X ..` where `'X`
445+
// Check if the `ty` is `&'X ..` where `'X`
447446
// is the region we are looking for -- if so, and we have a `&T`
448447
// on the RHS, then we want to highlight the `&` like so:
449448
//

0 commit comments

Comments
 (0)