diff --git a/src/librustc/arena.rs b/src/librustc/arena.rs
index 164e0e85c5a..3695607ff3c 100644
--- a/src/librustc/arena.rs
+++ b/src/librustc/arena.rs
@@ -122,14 +122,15 @@ macro_rules! arena_types {
             [few] crate_variances: rustc::ty::CrateVariancesMap<'tcx>,
             [few] inferred_outlives_crate: rustc::ty::CratePredicatesMap<'tcx>,
             [] upvars: rustc_data_structures::fx::FxIndexMap<rustc::hir::HirId, rustc::hir::Upvar>,
-            // HIR nodes arenas
+
+            // HIR types
             [few] hir_forest: rustc::hir::map::Forest<$tcx>,
             [] attribute: syntax::ast::Attribute,
-            [] global_asm: rustc::hir::GlobalAsm,
+            [few] global_asm: rustc::hir::GlobalAsm,
             [] fn_decl: rustc::hir::FnDecl,
             [] foreign_item: rustc::hir::ForeignItem<$tcx>,
             [] impl_item_ref: rustc::hir::ImplItemRef,
-            [] macro_def: rustc::hir::MacroDef<$tcx>,
+            [few] macro_def: rustc::hir::MacroDef<$tcx>,
             [] param: rustc::hir::Param,
             [] path: rustc::hir::Path,
             [] struct_field: rustc::hir::StructField<$tcx>,
diff --git a/src/librustc/hir/print.rs b/src/librustc/hir/print.rs
index f0499e5853f..85747cadbd7 100644
--- a/src/librustc/hir/print.rs
+++ b/src/librustc/hir/print.rs
@@ -107,7 +107,7 @@ fn print_generic_args(&mut self, args: &ast::GenericArgs, _colons_before_params:
 /// it can scan the input text for comments to copy forward.
 pub fn print_crate<'a>(cm: &'a SourceMap,
                        sess: &ParseSess,
-                       krate: &hir::Crate<'a>,
+                       krate: &hir::Crate<'_>,
                        filename: FileName,
                        input: String,
                        ann: &'a dyn PpAnn) -> String {