mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid going through queries if a value of type AssocItem is already available

Browse Source
This commit is contained in:
Oli Scherer 2023-06-05 14:22:45 +00:00
parent 42f28f9eb4
commit 604ffab063
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_hir_analysis/src/astconv/mod.rs
View File

@ -1601,7 +1601,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
tcx.associated_items(pred.def_id()) tcx.associated_items(pred.def_id())
.in_definition_order() .in_definition_order()
.filter(|item| item.kind == ty::AssocKind::Type) .filter(|item| item.kind == ty::AssocKind::Type)
.filter(|item| tcx.opt_rpitit_info(item.def_id).is_none()) .filter(|item| item.opt_rpitit_info.is_none())
.map(|item| item.def_id), .map(|item| item.def_id),
); );
} }

4
compiler/rustc_hir_analysis/src/check/compare_impl_item.rs
View File

@ -1216,7 +1216,7 @@ fn compare_number_of_generics<'tcx>(
// has mismatched type or const generic arguments, then the method that it's // has mismatched type or const generic arguments, then the method that it's
// inheriting the generics from will also have mismatched arguments, and // inheriting the generics from will also have mismatched arguments, and
// we'll report an error for that instead. Delay a bug for safety, though. // we'll report an error for that instead. Delay a bug for safety, though.
if tcx.opt_rpitit_info(trait_.def_id).is_some() { if trait_.opt_rpitit_info.is_some() {
return Err(tcx.sess.delay_span_bug( return Err(tcx.sess.delay_span_bug(
rustc_span::DUMMY_SP, rustc_span::DUMMY_SP,
"errors comparing numbers of generics of trait/impl functions were not emitted", "errors comparing numbers of generics of trait/impl functions were not emitted",
@ -2006,7 +2006,7 @@ pub(super) fn check_type_bounds<'tcx>(
// A synthetic impl Trait for RPITIT desugaring has no HIR, which we currently use to get the // A synthetic impl Trait for RPITIT desugaring has no HIR, which we currently use to get the
// span for an impl's associated type. Instead, for these, use the def_span for the synthesized // span for an impl's associated type. Instead, for these, use the def_span for the synthesized
// associated type. // associated type.
let impl_ty_span = if tcx.opt_rpitit_info(impl_ty.def_id).is_some() { let impl_ty_span = if impl_ty.opt_rpitit_info.is_some() {
tcx.def_span(impl_ty_def_id) tcx.def_span(impl_ty_def_id)
} else { } else {
match tcx.hir().get_by_def_id(impl_ty_def_id) { match tcx.hir().get_by_def_id(impl_ty_def_id) {

2
compiler/rustc_hir_analysis/src/check/mod.rs
View File

@ -188,7 +188,7 @@ fn missing_items_err(
full_impl_span: Span, full_impl_span: Span,
) { ) {
let missing_items = let missing_items =
missing_items.iter().filter(|trait_item| tcx.opt_rpitit_info(trait_item.def_id).is_none()); missing_items.iter().filter(|trait_item| trait_item.opt_rpitit_info.is_none());
let missing_items_msg = missing_items let missing_items_msg = missing_items
.clone() .clone()

2
compiler/rustc_trait_selection/src/traits/object_safety.rs
View File

@ -161,7 +161,7 @@ fn object_safety_violations_for_trait(
.in_definition_order() .in_definition_order()
.filter(|item| item.kind == ty::AssocKind::Type) .filter(|item| item.kind == ty::AssocKind::Type)
.filter(|item| !tcx.generics_of(item.def_id).params.is_empty()) .filter(|item| !tcx.generics_of(item.def_id).params.is_empty())
.filter(|item| tcx.opt_rpitit_info(item.def_id).is_none()) .filter(|item| item.opt_rpitit_info.is_none())
.map(|item| { .map(|item| {
let ident = item.ident(tcx); let ident = item.ident(tcx);
ObjectSafetyViolation::GAT(ident.name, ident.span) ObjectSafetyViolation::GAT(ident.name, ident.span)