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

Move refinement check out of compare_impl_item

Browse source
This commit is contained in:
Michael Goulet 2024-11-30 16:44:58 +00:00
parent a3623f20ae
commit 1e655ef213
5 changed files with 48 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
compiler/rustc_hir_analysis/src/check/check.rs
View file

@ -1045,7 +1045,24 @@ fn check_impl_items_against_trait<'tcx>(
continue;
};
let _ = tcx.ensure().compare_impl_item(impl_item.expect_local());
let res = tcx.ensure().compare_impl_item(impl_item.expect_local());
if res.is_ok() {
match ty_impl_item.kind {
ty::AssocKind::Fn => {
compare_impl_item::refine::check_refining_return_position_impl_trait_in_trait(
tcx,
ty_impl_item,
ty_trait_item,
tcx.impl_trait_ref(ty_impl_item.container_id(tcx))
.unwrap()
.instantiate_identity(),
);
}
ty::AssocKind::Const => {}
ty::AssocKind::Type => {}
}
}
check_specialization_validity(
tcx,

8
compiler/rustc_hir_analysis/src/check/compare_impl_item.rs
View file

@ -33,7 +33,7 @@ use tracing::{debug, instrument};
use super::potentially_plural_count;
use crate::errors::{LifetimesOrBoundsMismatchOnTrait, MethodShouldReturnFuture};
mod refine;
pub(super) mod refine;
/// Call the query `tcx.compare_impl_item()` directly instead.
pub(super) fn compare_impl_item(
@ -70,12 +70,6 @@ fn compare_impl_method<'tcx>(
) -> Result<(), ErrorGuaranteed> {
check_method_is_structurally_compatible(tcx, impl_m, trait_m, impl_trait_ref, false)?;
compare_method_predicate_entailment(tcx, impl_m, trait_m, impl_trait_ref)?;
refine::check_refining_return_position_impl_trait_in_trait(
tcx,
impl_m,
trait_m,
impl_trait_ref,
);
Ok(())
}

2
compiler/rustc_hir_analysis/src/check/compare_impl_item/refine.rs
View file

@ -17,7 +17,7 @@ use rustc_trait_selection::traits::outlives_bounds::InferCtxtExt;
use rustc_trait_selection::traits::{ObligationCtxt, elaborate, normalize_param_env_or_error};
/// Check that an implementation does not refine an RPITIT from a trait method signature.
pub(super) fn check_refining_return_position_impl_trait_in_trait<'tcx>(
pub(crate) fn check_refining_return_position_impl_trait_in_trait<'tcx>(
tcx: TyCtxt<'tcx>,
impl_m: ty::AssocItem,
trait_m: ty::AssocItem,