From: Niko Matsakis <niko@alum.mit.edu>
Date: Mon, 12 Aug 2019 22:14:48 +0000 (-0400)
Subject: use `modern` everywhere
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=cbe8518407fd6986093946353252b0384867aa53;p=rust.git

use `modern` everywhere
---

diff --git a/src/librustc/hir/lowering.rs b/src/librustc/hir/lowering.rs
index 184180d67be..0816c7a20f8 100644
--- a/src/librustc/hir/lowering.rs
+++ b/src/librustc/hir/lowering.rs
@@ -136,6 +136,9 @@ pub struct LoweringContext<'a> {
     /// When `is_collectin_in_band_lifetimes` is true, each lifetime is checked
     /// against this list to see if it is already in-scope, or if a definition
     /// needs to be created for it.
+    ///
+    /// We always store a `modern()` version of the param-name in this
+    /// vector.
     in_scope_lifetimes: Vec<ParamName>,
 
     current_module: NodeId,
diff --git a/src/librustc/hir/lowering/item.rs b/src/librustc/hir/lowering/item.rs
index 4d6039e101a..7b774812a24 100644
--- a/src/librustc/hir/lowering/item.rs
+++ b/src/librustc/hir/lowering/item.rs
@@ -123,7 +123,7 @@ fn with_parent_item_lifetime_defs<T>(
             _ => &[],
         };
         let lt_def_names = parent_generics.iter().filter_map(|param| match param.kind {
-            hir::GenericParamKind::Lifetime { .. } => Some(param.name),
+            hir::GenericParamKind::Lifetime { .. } => Some(param.name.modern()),
             _ => None,
         });
         self.in_scope_lifetimes.extend(lt_def_names);