Auto merge of #60174 - matthewjasper:add-match-arm-scopes, r=pnkfelix

[rust.git] / src / librustc / hir / map / mod.rs

diff --git a/src/librustc/hir/map/mod.rs b/src/librustc/hir/map/mod.rs
index d8fe90d40481bb9154d8f84986a8669ed82d5744..0741d9322c65328eff9d2fb7dcb1ffdac3883481 100644 (file)
--- a/src/librustc/hir/map/mod.rs
+++ b/src/librustc/hir/map/mod.rs
@@ -520,7 +520,7 @@ pub fn ty_param_owner(&self, id: HirId) -> HirId {
     pub fn ty_param_name(&self, id: HirId) -> Name {
         match self.get_by_hir_id(id) {
             Node::Item(&Item { node: ItemKind::Trait(..), .. }) |
-            Node::Item(&Item { node: ItemKind::TraitAlias(..), .. }) => keywords::SelfUpper.name(),
+            Node::Item(&Item { node: ItemKind::TraitAlias(..), .. }) => kw::SelfUpper,
             Node::GenericParam(param) => param.name.ident().name,
             _ => bug!("ty_param_name: {} not a type parameter", self.hir_to_string(id)),
         }
@@ -958,7 +958,7 @@ pub fn expect_expr_by_hir_id(&self, id: HirId) -> &'hir Expr {
         }
     }
 
-    /// Returns the name associated with the given NodeId's AST.
+    /// Returns the name associated with the given `NodeId`'s AST.
     pub fn name(&self, id: NodeId) -> Name {
         let hir_id = self.node_to_hir_id(id);
         self.name_by_hir_id(hir_id)