bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

reduce query calls in pretty printing when finding bounds of

Browse source 
associated types
This commit is contained in:
Adwin White 2025-02-10 14:43:22 +08:00
parent 942db6782f
commit a634246b66
1 changed files with 43 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

84
compiler/rustc_hir_analysis/src/collect/item_bounds.rs
View file

@ -30,53 +30,55 @@ fn associated_type_bounds<'tcx>(
span: Span, span: Span,
filter: PredicateFilter, filter: PredicateFilter,
) -> &'tcx [(ty::Clause<'tcx>, Span)] { ) -> &'tcx [(ty::Clause<'tcx>, Span)] {
let item_ty = Ty::new_projection_from_args( ty::print::with_reduced_queries!({
tcx, let item_ty = Ty::new_projection_from_args(
assoc_item_def_id.to_def_id(), tcx,
GenericArgs::identity_for_item(tcx, assoc_item_def_id), assoc_item_def_id.to_def_id(),
); GenericArgs::identity_for_item(tcx, assoc_item_def_id),
);
let icx = ItemCtxt::new(tcx, assoc_item_def_id); let icx = ItemCtxt::new(tcx, assoc_item_def_id);
let mut bounds = Bounds::default(); let mut bounds = Bounds::default();
icx.lowerer().lower_bounds(item_ty, hir_bounds, &mut bounds, ty::List::empty(), filter); icx.lowerer().lower_bounds(item_ty, hir_bounds, &mut bounds, ty::List::empty(), filter);
// Associated types are implicitly sized unless a `?Sized` bound is found // Associated types are implicitly sized unless a `?Sized` bound is found
match filter { match filter {
PredicateFilter::All PredicateFilter::All
| PredicateFilter::SelfOnly | PredicateFilter::SelfOnly
| PredicateFilter::SelfTraitThatDefines(_) | PredicateFilter::SelfTraitThatDefines(_)
| PredicateFilter::SelfAndAssociatedTypeBounds => { | PredicateFilter::SelfAndAssociatedTypeBounds => {
icx.lowerer().add_sized_bound(&mut bounds, item_ty, hir_bounds, None, span); icx.lowerer().add_sized_bound(&mut bounds, item_ty, hir_bounds, None, span);
}
// `ConstIfConst` is only interested in `~const` bounds.
PredicateFilter::ConstIfConst | PredicateFilter::SelfConstIfConst => {}
} }
// `ConstIfConst` is only interested in `~const` bounds.
PredicateFilter::ConstIfConst | PredicateFilter::SelfConstIfConst => {}
}
let trait_def_id = tcx.local_parent(assoc_item_def_id); let trait_def_id = tcx.local_parent(assoc_item_def_id);
let trait_predicates = tcx.trait_explicit_predicates_and_bounds(trait_def_id); let trait_predicates = tcx.trait_explicit_predicates_and_bounds(trait_def_id);
let item_trait_ref = ty::TraitRef::identity(tcx, tcx.parent(assoc_item_def_id.to_def_id())); let item_trait_ref = ty::TraitRef::identity(tcx, tcx.parent(assoc_item_def_id.to_def_id()));
let bounds_from_parent = let bounds_from_parent =
trait_predicates.predicates.iter().copied().filter_map(|(clause, span)| { trait_predicates.predicates.iter().copied().filter_map(|(clause, span)| {
remap_gat_vars_and_recurse_into_nested_projections( remap_gat_vars_and_recurse_into_nested_projections(
tcx, tcx,
filter, filter,
item_trait_ref, item_trait_ref,
assoc_item_def_id, assoc_item_def_id,
span, span,
clause, clause,
) )
}); });
let all_bounds = tcx.arena.alloc_from_iter(bounds.clauses().chain(bounds_from_parent));
debug!(
"associated_type_bounds({}) = {:?}",
tcx.def_path_str(assoc_item_def_id.to_def_id()),
all_bounds
);
assert_only_contains_predicates_from(filter, all_bounds, item_ty);
let all_bounds = tcx.arena.alloc_from_iter(bounds.clauses().chain(bounds_from_parent));
debug!(
"associated_type_bounds({}) = {:?}",
tcx.def_path_str(assoc_item_def_id.to_def_id()),
all_bounds all_bounds
); })
assert_only_contains_predicates_from(filter, all_bounds, item_ty);
all_bounds
} }
/// The code below is quite involved, so let me explain. /// The code below is quite involved, so let me explain.