Skip to content

remove old solver use of SolverRelating #163108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rust-bors merged 1 commit into from
Sep 21, 2026
Merged

remove old solver use of SolverRelating #163108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions compiler/rustc_hir_analysis/src/coherence/builtin/coerce_shared.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ use rustc_hir as hir;
use rustc_hir::ItemKind;
use rustc_hir::attrs::lang_items::LangItem;
use rustc_hir::def_id::{DefId, LocalDefId};
use rustc_infer::infer::{InferCtxt, TyCtxtInferExt};
use rustc_infer::infer::{DefineOpaqueTypes, InferCtxt, TyCtxtInferExt};
use rustc_infer::traits::{Obligation, TraitErrors};
use rustc_middle::ty::relate::solver_relating::RelateExt;
use rustc_middle::ty::{self, Ty, TyCtxt, TypeVisitableExt, TypingMode, Unnormalized};
use rustc_span::Span;
use rustc_trait_selection::error_reporting::InferCtxtErrorExt;
Expand Down Expand Up @@ -760,6 +759,9 @@ enum FieldRelation {
// instantiating a field can expose projections. Each candidate relation uses a
// fresh inference context, so failed checks cannot affect the next one; this
// intentionally normalizes the fields for each check.
//
// FIXME(field_projections): This function should take `Unnormalized<Ty<'tcx>>` for
// `source_ty` and `target_ty`.
fn field_tys_satisfy_relation_after_normalization_and_resolution<'tcx>(
tcx: TyCtxt<'tcx>,
impl_did: LocalDefId,
Expand All @@ -785,7 +787,10 @@ fn field_tys_satisfy_relation_after_normalization_and_resolution<'tcx>(

match relation {
FieldRelation::Equal => {
if infcx.relate(param_env, source_ty, ty::Variance::Invariant, target_ty, span).is_err()
if infcx
.at(&cause, param_env)
.relate(DefineOpaqueTypes::Yes, source_ty, ty::Variance::Invariant, target_ty)
.is_err()
{
return false;
}
Expand Down
1 change: 1 addition & 0 deletions compiler/rustc_type_ir/src/relate/solver_relating.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ where
param_env: I::ParamEnv,
span: I::Span,
) -> Self {
debug_assert!(infcx.next_trait_solver());
SolverRelating {
infcx,
span,
Expand Down
Loading