From 2eb76fc8a17cbbbbefe12c6a4413b3d803c03941 Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Thu, 6 Sep 2018 12:38:15 -0400 Subject: [PATCH] add a useful debug to `give_region_a_name` --- .../region_infer/error_reporting/region_name.rs | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/librustc_mir/borrow_check/nll/region_infer/error_reporting/region_name.rs b/src/librustc_mir/borrow_check/nll/region_infer/error_reporting/region_name.rs index 6177194ab91..8ac4bcd67b6 100644 --- a/src/librustc_mir/borrow_check/nll/region_infer/error_reporting/region_name.rs +++ b/src/librustc_mir/borrow_check/nll/region_infer/error_reporting/region_name.rs @@ -62,20 +62,26 @@ impl<'tcx> RegionInferenceContext<'tcx> { assert!(self.universal_regions.is_universal_region(fr)); - self.give_name_from_error_region(infcx.tcx, mir_def_id, fr, counter, diag) + let value = self.give_name_from_error_region(infcx.tcx, mir_def_id, fr, counter, diag) .or_else(|| { self.give_name_if_anonymous_region_appears_in_arguments( - infcx, mir, mir_def_id, fr, counter, diag) + infcx, mir, mir_def_id, fr, counter, diag, + ) }) .or_else(|| { self.give_name_if_anonymous_region_appears_in_upvars( - infcx.tcx, mir, fr, counter, diag) + infcx.tcx, mir, fr, counter, diag, + ) }) .or_else(|| { self.give_name_if_anonymous_region_appears_in_output( - infcx, mir, mir_def_id, fr, counter, diag) + infcx, mir, mir_def_id, fr, counter, diag, + ) }) - .unwrap_or_else(|| span_bug!(mir.span, "can't make a name for free region {:?}", fr)) + .unwrap_or_else(|| span_bug!(mir.span, "can't make a name for free region {:?}", fr)); + + debug!("give_region_a_name: gave name {:?}", value); + value } /// Check for the case where `fr` maps to something that the -- 2.44.0