bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #93312 - pierwill:map-all-local-trait-impls, r=cjgillot

Browse source 
Return an indexmap in `all_local_trait_impls` query

The data structure previously used here required that `DefId` be `Ord`. As part of #90317, we do not want `DefId` to implement `Ord`.
This commit is contained in:
bors 2022-02-02 15:36:12 +00:00
commit 7cd14d2f56
4 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_resolve/src/lib.rs
View file

@ -68,7 +68,7 @@ use rustc_span::{Span, DUMMY_SP};
use smallvec::{smallvec, SmallVec};
use std::cell::{Cell, RefCell};
use std::collections::{BTreeMap, BTreeSet};
use std::collections::BTreeSet;
use std::ops::ControlFlow;
use std::{cmp, fmt, iter, mem, ptr};
use tracing::debug;
@ -1061,7 +1061,7 @@ pub struct Resolver<'a> {
item_generics_num_lifetimes: FxHashMap<LocalDefId, usize>,
main_def: Option<MainDefinition>,
trait_impls: BTreeMap<DefId, Vec<LocalDefId>>,
trait_impls: FxIndexMap<DefId, Vec<LocalDefId>>,
/// A list of proc macro LocalDefIds, written out in the order in which
/// they are declared in the static array generated by proc_macro_harness.
proc_macros: Vec<NodeId>,