From 25f575b29f467d2bb7aff9be359743414d218dfa Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Wed, 20 May 2020 23:11:56 +0100
Subject: [PATCH] Use `DefId` in `ResolverOutputs::maybe_unused_extern_crates`
 instead of `NodeId`

---
 src/librustc_middle/ty/context.rs |  6 +-----
 src/librustc_middle/ty/mod.rs     |  4 ++--
 src/librustc_resolve/lib.rs       | 13 +++++++++++--
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/librustc_middle/ty/context.rs b/src/librustc_middle/ty/context.rs
index d090f9235ce3..fc77df51aa85 100644
--- a/src/librustc_middle/ty/context.rs
+++ b/src/librustc_middle/ty/context.rs
@@ -1133,11 +1133,7 @@ impl<'tcx> TyCtxt<'tcx> {
             trait_map,
             export_map: resolutions.export_map,
             maybe_unused_trait_imports: resolutions.maybe_unused_trait_imports,
-            maybe_unused_extern_crates: resolutions
-                .maybe_unused_extern_crates
-                .into_iter()
-                .map(|(id, sp)| (definitions.local_def_id(id).to_def_id(), sp))
-                .collect(),
+            maybe_unused_extern_crates: resolutions.maybe_unused_extern_crates,
             glob_map: resolutions
                 .glob_map
                 .into_iter()
diff --git a/src/librustc_middle/ty/mod.rs b/src/librustc_middle/ty/mod.rs
index 4dc815fa7bcd..550016ce81b4 100644
--- a/src/librustc_middle/ty/mod.rs
+++ b/src/librustc_middle/ty/mod.rs
@@ -17,7 +17,7 @@ use crate::ty;
 use crate::ty::subst::{InternalSubsts, Subst, SubstsRef};
 use crate::ty::util::{Discr, IntTypeExt};
 use rustc_ast::ast;
-use rustc_ast::node_id::{NodeId, NodeMap};
+use rustc_ast::node_id::NodeMap;
 use rustc_attr as attr;
 use rustc_data_structures::captures::Captures;
 use rustc_data_structures::fingerprint::Fingerprint;
@@ -124,7 +124,7 @@ pub struct ResolverOutputs {
     pub extern_crate_map: NodeMap<CrateNum>,
     pub trait_map: FxHashMap<hir::HirId, Vec<hir::TraitCandidate<hir::HirId>>>,
     pub maybe_unused_trait_imports: FxHashSet<LocalDefId>,
-    pub maybe_unused_extern_crates: Vec<(NodeId, Span)>,
+    pub maybe_unused_extern_crates: Vec<(DefId, Span)>,
     pub export_map: ExportMap<hir::HirId>,
     pub glob_map: GlobMap,
     /// Extern prelude entries. The value is `true` if the entry was introduced
diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs
index 21a535b85aac..b3a668f00ff0 100644
--- a/src/librustc_resolve/lib.rs
+++ b/src/librustc_resolve/lib.rs
@@ -1303,6 +1303,11 @@ impl<'a> Resolver<'a> {
             .into_iter()
             .map(|id| definitions.local_def_id(id))
             .collect();
+        let maybe_unused_extern_crates = self
+            .maybe_unused_extern_crates
+            .into_iter()
+            .map(|(id, sp)| (definitions.local_def_id(id).to_def_id(), sp))
+            .collect();
         ResolverOutputs {
             definitions: definitions,
             cstore: Box::new(self.crate_loader.into_cstore()),
@@ -1311,7 +1316,7 @@ impl<'a> Resolver<'a> {
             trait_map,
             glob_map: self.glob_map,
             maybe_unused_trait_imports,
-            maybe_unused_extern_crates: self.maybe_unused_extern_crates,
+            maybe_unused_extern_crates,
             extern_prelude: self
                 .extern_prelude
                 .iter()
@@ -1358,7 +1363,11 @@ impl<'a> Resolver<'a> {
                 .iter()
                 .map(|id| self.definitions.local_def_id(id.clone()))
                 .collect(),
-            maybe_unused_extern_crates: self.maybe_unused_extern_crates.clone(),
+            maybe_unused_extern_crates: self
+                .maybe_unused_extern_crates
+                .iter()
+                .map(|(id, sp)| (self.definitions.local_def_id(id.clone()).to_def_id(), sp.clone()))
+                .collect(),
             extern_prelude: self
                 .extern_prelude
                 .iter()