nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-10-30 22:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename

Browse Source
This commit is contained in:
lcnr 2021-09-16 17:32:57 +02:00
parent e7958d35ca
commit ca2c55d264
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/rustc_middle/src/traits/specialization_graph.rs
View File

@ -55,14 +55,14 @@ pub struct Children {
// Impls of a trait (or specializations of a given impl). To allow for // Impls of a trait (or specializations of a given impl). To allow for
// quicker lookup, the impls are indexed by a simplified version of their // quicker lookup, the impls are indexed by a simplified version of their
// `Self` type: impls with a simplifiable `Self` are stored in // `Self` type: impls with a simplifiable `Self` are stored in
// `nonblanket_impls` keyed by it, while all other impls are stored in // `non_blanket_impls` keyed by it, while all other impls are stored in
// `blanket_impls`. // `blanket_impls`.
// //
// A similar division is used within `TraitDef`, but the lists there collect // A similar division is used within `TraitDef`, but the lists there collect
// together *all* the impls for a trait, and are populated prior to building // together *all* the impls for a trait, and are populated prior to building
// the specialization graph. // the specialization graph.
/// Impls of the trait. /// Impls of the trait.
pub nonblanket_impls: FxHashMap<SimplifiedType, Vec<DefId>>, pub non_blanket_impls: FxHashMap<SimplifiedType, Vec<DefId>>,
/// Blanket impls associated with the trait. /// Blanket impls associated with the trait.
pub blanket_impls: Vec<DefId>, pub blanket_impls: Vec<DefId>,
@ -238,8 +238,8 @@ pub fn ancestors(
impl<'a> HashStable<StableHashingContext<'a>> for Children { impl<'a> HashStable<StableHashingContext<'a>> for Children {
fn hash_stable(&self, hcx: &mut StableHashingContext<'a>, hasher: &mut StableHasher) { fn hash_stable(&self, hcx: &mut StableHashingContext<'a>, hasher: &mut StableHasher) {
let Children { ref nonblanket_impls, ref blanket_impls } = *self; let Children { ref non_blanket_impls, ref blanket_impls } = *self;
ich::hash_stable_trait_impls(hcx, hasher, blanket_impls, nonblanket_impls); ich::hash_stable_trait_impls(hcx, hasher, blanket_impls, non_blanket_impls);
} }
} }

8
compiler/rustc_trait_selection/src/traits/specialize/specialization_graph.rs
View File

@ -50,7 +50,7 @@ impl ChildrenExt for Children {
let trait_ref = tcx.impl_trait_ref(impl_def_id).unwrap(); let trait_ref = tcx.impl_trait_ref(impl_def_id).unwrap();
if let Some(st) = fast_reject::simplify_type(tcx, trait_ref.self_ty(), false) { if let Some(st) = fast_reject::simplify_type(tcx, trait_ref.self_ty(), false) {
debug!("insert_blindly: impl_def_id={:?} st={:?}", impl_def_id, st); debug!("insert_blindly: impl_def_id={:?} st={:?}", impl_def_id, st);
self.nonblanket_impls.entry(st).or_default().push(impl_def_id) self.non_blanket_impls.entry(st).or_default().push(impl_def_id)
} else { } else {
debug!("insert_blindly: impl_def_id={:?} st=None", impl_def_id); debug!("insert_blindly: impl_def_id={:?} st=None", impl_def_id);
self.blanket_impls.push(impl_def_id) self.blanket_impls.push(impl_def_id)
@ -65,7 +65,7 @@ impl ChildrenExt for Children {
let vec: &mut Vec<DefId>; let vec: &mut Vec<DefId>;
if let Some(st) = fast_reject::simplify_type(tcx, trait_ref.self_ty(), false) { if let Some(st) = fast_reject::simplify_type(tcx, trait_ref.self_ty(), false) {
debug!("remove_existing: impl_def_id={:?} st={:?}", impl_def_id, st); debug!("remove_existing: impl_def_id={:?} st={:?}", impl_def_id, st);
vec = self.nonblanket_impls.get_mut(&st).unwrap(); vec = self.non_blanket_impls.get_mut(&st).unwrap();
} else { } else {
debug!("remove_existing: impl_def_id={:?} st=None", impl_def_id); debug!("remove_existing: impl_def_id={:?} st=None", impl_def_id);
vec = &mut self.blanket_impls; vec = &mut self.blanket_impls;
@ -216,7 +216,7 @@ impl ChildrenExt for Children {
} }
fn iter_children(children: &mut Children) -> impl Iterator<Item = DefId> + '_ { fn iter_children(children: &mut Children) -> impl Iterator<Item = DefId> + '_ {
let nonblanket = children.nonblanket_impls.iter_mut().flat_map(|(_, v)| v.iter()); let nonblanket = children.non_blanket_impls.iter_mut().flat_map(|(_, v)| v.iter());
children.blanket_impls.iter().chain(nonblanket).cloned() children.blanket_impls.iter().chain(nonblanket).cloned()
} }
@ -224,7 +224,7 @@ fn filtered_children(
children: &mut Children, children: &mut Children,
st: SimplifiedType, st: SimplifiedType,
) -> impl Iterator<Item = DefId> + '_ { ) -> impl Iterator<Item = DefId> + '_ {
let nonblanket = children.nonblanket_impls.entry(st).or_default().iter(); let nonblanket = children.non_blanket_impls.entry(st).or_default().iter();
children.blanket_impls.iter().chain(nonblanket).cloned() children.blanket_impls.iter().chain(nonblanket).cloned()
} }