Skip to content

Commit 13c86f2

Browse files
committed
Use LocalDefId in ResolverOutputs::maybe_unused_trait_imports instead of NodeId
1 parent 52359f7 commit 13c86f2

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

src/librustc_middle/ty/context.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1132,11 +1132,7 @@ impl<'tcx> TyCtxt<'tcx> {
11321132
extern_crate_map: resolutions.extern_crate_map,
11331133
trait_map,
11341134
export_map: resolutions.export_map,
1135-
maybe_unused_trait_imports: resolutions
1136-
.maybe_unused_trait_imports
1137-
.into_iter()
1138-
.map(|id| definitions.local_def_id(id))
1139-
.collect(),
1135+
maybe_unused_trait_imports: resolutions.maybe_unused_trait_imports,
11401136
maybe_unused_extern_crates: resolutions
11411137
.maybe_unused_extern_crates
11421138
.into_iter()

src/librustc_middle/ty/mod.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@ use crate::ty;
1717
use crate::ty::subst::{InternalSubsts, Subst, SubstsRef};
1818
use crate::ty::util::{Discr, IntTypeExt};
1919
use rustc_ast::ast;
20-
use rustc_ast::node_id::{NodeId, NodeMap, NodeSet};
20+
use rustc_ast::node_id::{NodeId, NodeMap};
2121
use rustc_attr as attr;
2222
use rustc_data_structures::captures::Captures;
2323
use rustc_data_structures::fingerprint::Fingerprint;
2424
use rustc_data_structures::fx::FxHashMap;
25+
use rustc_data_structures::fx::FxHashSet;
2526
use rustc_data_structures::fx::FxIndexMap;
2627
use rustc_data_structures::sorted_map::SortedIndexMultiMap;
2728
use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
@@ -122,7 +123,7 @@ pub struct ResolverOutputs {
122123
pub cstore: Box<CrateStoreDyn>,
123124
pub extern_crate_map: NodeMap<CrateNum>,
124125
pub trait_map: FxHashMap<hir::HirId, Vec<hir::TraitCandidate<hir::HirId>>>,
125-
pub maybe_unused_trait_imports: NodeSet,
126+
pub maybe_unused_trait_imports: FxHashSet<LocalDefId>,
126127
pub maybe_unused_extern_crates: Vec<(NodeId, Span)>,
127128
pub export_map: ExportMap<hir::HirId>,
128129
pub glob_map: GlobMap,

src/librustc_resolve/lib.rs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1298,14 +1298,19 @@ impl<'a> Resolver<'a> {
12981298
}
12991299
map
13001300
};
1301+
let maybe_unused_trait_imports = self
1302+
.maybe_unused_trait_imports
1303+
.into_iter()
1304+
.map(|id| definitions.local_def_id(id))
1305+
.collect();
13011306
ResolverOutputs {
13021307
definitions: definitions,
13031308
cstore: Box::new(self.crate_loader.into_cstore()),
13041309
extern_crate_map: self.extern_crate_map,
13051310
export_map,
13061311
trait_map,
13071312
glob_map: self.glob_map,
1308-
maybe_unused_trait_imports: self.maybe_unused_trait_imports,
1313+
maybe_unused_trait_imports,
13091314
maybe_unused_extern_crates: self.maybe_unused_extern_crates,
13101315
extern_prelude: self
13111316
.extern_prelude
@@ -1348,7 +1353,11 @@ impl<'a> Resolver<'a> {
13481353
map
13491354
},
13501355
glob_map: self.glob_map.clone(),
1351-
maybe_unused_trait_imports: self.maybe_unused_trait_imports.clone(),
1356+
maybe_unused_trait_imports: self
1357+
.maybe_unused_trait_imports
1358+
.iter()
1359+
.map(|id| self.definitions.local_def_id(id.clone()))
1360+
.collect(),
13521361
maybe_unused_extern_crates: self.maybe_unused_extern_crates.clone(),
13531362
extern_prelude: self
13541363
.extern_prelude

0 commit comments

Comments
 (0)