]> git.lizzy.rs Git - rust.git/commitdiff
use `modern` everywhere
authorNiko Matsakis <niko@alum.mit.edu>
Mon, 12 Aug 2019 22:14:48 +0000 (18:14 -0400)
committerNiko Matsakis <niko@alum.mit.edu>
Mon, 12 Aug 2019 22:14:48 +0000 (18:14 -0400)
src/librustc/hir/lowering.rs
src/librustc/hir/lowering/item.rs

index 184180d67be7b00a6aaaa812fd044e1a3f878526..0816c7a20f8501c3fe7410fd20cea6397423ccf0 100644 (file)
@@ -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,
index 4d6039e101a888d6d47c2cd75ded6dae1febe5fd..7b774812a24f26e853d9491239cfca1f794a2f16 100644 (file)
@@ -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);