@@ -6,7 +6,7 @@ use std::ops::{Deref, DerefMut};
6
6
use rustc_abi:: { ExternAbi , Size } ;
7
7
use rustc_apfloat:: Float ;
8
8
use rustc_apfloat:: ieee:: { Double , Half , Quad , Single } ;
9
- use rustc_data_structures:: fx:: { FxIndexMap , IndexEntry } ;
9
+ use rustc_data_structures:: fx:: { FxHashMap , FxIndexMap } ;
10
10
use rustc_data_structures:: unord:: UnordMap ;
11
11
use rustc_hir as hir;
12
12
use rustc_hir:: LangItem ;
@@ -3489,8 +3489,8 @@ pub fn trimmed_def_paths(tcx: TyCtxt<'_>, (): ()) -> DefIdMap<Symbol> {
3489
3489
3490
3490
// Once constructed, unique namespace+symbol pairs will have a `Some(_)` entry, while
3491
3491
// non-unique pairs will have a `None` entry.
3492
- let unique_symbols_rev: & mut FxIndexMap < ( Namespace , Symbol ) , Option < DefId > > =
3493
- & mut FxIndexMap :: default ( ) ;
3492
+ let unique_symbols_rev: & mut FxHashMap < ( Namespace , Symbol ) , Option < DefId > > =
3493
+ & mut FxHashMap :: default ( ) ;
3494
3494
3495
3495
for symbol_set in tcx. resolutions ( ( ) ) . glob_map . values ( ) {
3496
3496
for symbol in symbol_set {
@@ -3500,23 +3500,29 @@ pub fn trimmed_def_paths(tcx: TyCtxt<'_>, (): ()) -> DefIdMap<Symbol> {
3500
3500
}
3501
3501
}
3502
3502
3503
- for_each_def ( tcx, |ident, ns, def_id| match unique_symbols_rev. entry ( ( ns, ident. name ) ) {
3504
- IndexEntry :: Occupied ( mut v) => match v. get ( ) {
3505
- None => { }
3506
- Some ( existing) => {
3507
- if * existing != def_id {
3508
- v. insert ( None ) ;
3503
+ for_each_def ( tcx, |ident, ns, def_id| {
3504
+ use std:: collections:: hash_map:: Entry :: { Occupied , Vacant } ;
3505
+
3506
+ match unique_symbols_rev. entry ( ( ns, ident. name ) ) {
3507
+ Occupied ( mut v) => match v. get ( ) {
3508
+ None => { }
3509
+ Some ( existing) => {
3510
+ if * existing != def_id {
3511
+ v. insert ( None ) ;
3512
+ }
3509
3513
}
3514
+ } ,
3515
+ Vacant ( v) => {
3516
+ v. insert ( Some ( def_id) ) ;
3510
3517
}
3511
- } ,
3512
- IndexEntry :: Vacant ( v) => {
3513
- v. insert ( Some ( def_id) ) ;
3514
3518
}
3515
3519
} ) ;
3516
3520
3517
3521
// Put the symbol from all the unique namespace+symbol pairs into `map`.
3518
3522
let mut map: DefIdMap < Symbol > = Default :: default ( ) ;
3519
- for ( ( _, symbol) , opt_def_id) in unique_symbols_rev. drain ( ..) {
3523
+ // Precatious is taken below in the loop so we can allow this lint here.
3524
+ #[ allow( rustc:: potential_query_instability) ]
3525
+ for ( ( _, symbol) , opt_def_id) in unique_symbols_rev. drain ( ) {
3520
3526
use std:: collections:: hash_map:: Entry :: { Occupied , Vacant } ;
3521
3527
3522
3528
if let Some ( def_id) = opt_def_id {
0 commit comments