Renamed ppaux highlight region hook.

Changed `highlight_region_with_region` function(s) to
`highlight_region_with_bound_region` to be more specific and less
ambigious.

Author: davidtwco

src/librustc/util/ppaux.rs

@@ -40,7 +40,8 @@ thread_local! {
 thread_local! {
     /// Mechanism for highlighting of specific regions for display in NLL's 'borrow does not live
     /// long enough' errors. Contains a region to highlight and a counter to use.
-    static HIGHLIGHT_REGION_FOR_REGION: Cell<Option<(ty::BoundRegion, usize)>> = Cell::new(None)
+    static HIGHLIGHT_REGION_FOR_BOUND_REGION: Cell<Option<(ty::BoundRegion, usize)>> =
+        Cell::new(None)
 }
 
 macro_rules! gen_display_debug_body {
@@ -588,16 +589,16 @@ pub fn with_highlight_region_for_regionvid<R>(
     })
 }
 
-fn get_highlight_region_for_region() -> Option<(ty::BoundRegion, usize)> {
-    HIGHLIGHT_REGION_FOR_REGION.with(|hr| hr.get())
+fn get_highlight_region_for_bound_region() -> Option<(ty::BoundRegion, usize)> {
+    HIGHLIGHT_REGION_FOR_BOUND_REGION.with(|hr| hr.get())
 }
 
-pub fn with_highlight_region_for_region<R>(
+pub fn with_highlight_region_for_bound_region<R>(
     r: ty::BoundRegion,
     counter: usize,
     op: impl Fn() -> R
 ) -> R {
-    HIGHLIGHT_REGION_FOR_REGION.with(|hr| {
+    HIGHLIGHT_REGION_FOR_BOUND_REGION.with(|hr| {
         assert_eq!(hr.get(), None);
         hr.set(Some((r, counter)));
         let r = op();
@@ -754,7 +755,7 @@ define_print! {
                 return self.print_debug(f, cx);
             }
 
-            if let Some((region, counter)) = get_highlight_region_for_region() {
+            if let Some((region, counter)) = get_highlight_region_for_bound_region() {
                 if *self == region {
                     return match *self {
                         BrNamed(_, name) => write!(f, "{}", name),

src/librustc_mir/borrow_check/error_reporting.rs

@@ -22,7 +22,7 @@ use rustc::ty;
 use rustc_data_structures::fx::FxHashSet;
 use rustc_data_structures::sync::Lrc;
 use rustc_errors::{Applicability, DiagnosticBuilder};
-use rustc::util::ppaux::with_highlight_region_for_region;
+use rustc::util::ppaux::with_highlight_region_for_bound_region;
 use syntax_pos::Span;
 
 use super::borrow_set::BorrowData;
@@ -1358,24 +1358,28 @@ impl<'tcx> AnnotatedBorrowFnSignature<'tcx> {
         }
     }
 
+    /// Return the name of the provided `Ty` (that must be a reference) with a synthesized lifetime
+    /// name where required.
     fn get_name_for_ty(&self, ty: ty::Ty<'tcx>, counter: usize) -> String {
         // We need to add synthesized lifetimes where appropriate. We do
         // this by hooking into the pretty printer and telling it to label the
         // lifetimes without names with the value `'0`.
         match ty.sty {
             ty::TyKind::Ref(ty::RegionKind::ReLateBound(_, br), _, _) |
             ty::TyKind::Ref(ty::RegionKind::ReSkolemized(_, br), _, _) =>
-                with_highlight_region_for_region(*br, counter, || format!("{}", ty)),
+                with_highlight_region_for_bound_region(*br, counter, || format!("{}", ty)),
             _ => format!("{}", ty),
         }
     }
 
+    /// Return the name of the provided `Ty` (that must be a reference)'s region with a
+    /// synthesized lifetime name where required.
     fn get_region_name_for_ty(&self, ty: ty::Ty<'tcx>, counter: usize) -> String {
         match ty.sty {
             ty::TyKind::Ref(region, _, _) => match region {
                 ty::RegionKind::ReLateBound(_, br) |
                 ty::RegionKind::ReSkolemized(_, br) =>
-                    with_highlight_region_for_region(*br, counter, || format!("{}", region)),
+                    with_highlight_region_for_bound_region(*br, counter, || format!("{}", region)),
                 _ => format!("{}", region),
             }
             _ => bug!("ty for annotation of borrow region is not a reference"),