Avoid another node_id_to_def_id call

Author: oli-obk

compiler/rustc_resolve/src/build_reduced_graph.rs

@@ -1207,9 +1207,9 @@ impl<'a, 'ra, 'tcx> BuildReducedGraphVisitor<'a, 'ra, 'tcx> {
  for (rule_i, rule_span) in &self.r.macro_map[&def_id.to_def_id()].rule_spans {
  self.r
  .unused_macro_rules
- .entry(def_id)
+ .entry(node_id)
  .or_default()
- .insert(*rule_i, (ident, *rule_span));
+ .insert(*rule_i, (ident, *rule_span, def_id));
  }
  }
  }

compiler/rustc_resolve/src/lib.rs

@@ -1140,7 +1140,7 @@ pub struct Resolver<'ra, 'tcx> {
  ast_transform_scopes: FxHashMap<LocalExpnId, Module<'ra>>,
  unused_macros: FxIndexMap<LocalDefId, (NodeId, Ident)>,
  /// A map from the macro to all its potentially unused arms.
- unused_macro_rules: FxIndexMap<LocalDefId, UnordMap<usize, (Ident, Span)>>,
+ unused_macro_rules: FxIndexMap<NodeId, UnordMap<usize, (Ident, Span, LocalDefId)>>,
  proc_macro_stubs: FxHashSet<LocalDefId>,
  /// Traces collected during macro resolution and validated when it's complete.
  single_segment_macro_resolutions:

compiler/rustc_resolve/src/macros.rs

@@ -323,8 +323,7 @@ impl<'ra, 'tcx> ResolverExpand for Resolver<'ra, 'tcx> {
  }
 
  fn record_macro_rule_usage(&mut self, id: NodeId, rule_i: usize) {
- let did = self.local_def_id(id);
- if let Some(rules) = self.unused_macro_rules.get_mut(&did) {
+ if let Some(rules) = self.unused_macro_rules.get_mut(&id) {
  rules.remove(&rule_i);
  }
  }
@@ -339,13 +338,12 @@ impl<'ra, 'tcx> ResolverExpand for Resolver<'ra, 'tcx> {
  );
  }
 
- for (&def_id, unused_arms) in self.unused_macro_rules.iter() {
- for (&arm_i, &(ident, rule_span)) in unused_arms.to_sorted_stable_ord() {
+ for (&node_id, unused_arms) in self.unused_macro_rules.iter() {
+ for (&arm_i, &(ident, rule_span, def_id)) in unused_arms.to_sorted_stable_ord() {
  if self.unused_macros.contains_key(&def_id) {
  // We already lint the entire macro as unused
  continue;
  }
- let node_id = self.def_id_to_node_id(def_id);
  self.lint_buffer.buffer_lint(
  UNUSED_MACRO_RULES,
  node_id,