diff options
| author | bors <bors@rust-lang.org> | 2023-02-11 05:46:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-02-11 05:46:24 +0000 |
| commit | 1623ab0246deebec4fe32dc525d20bf8a88096f2 (patch) | |
| tree | b53f139b7fbe2cd91228c2724e4affccfc1a85c9 /compiler/rustc_borrowck/src | |
| parent | 5a8dfd933a70cc47e44502a20fd67dfaec6555d5 (diff) | |
| parent | 4c98429d8c7b05276fa94eac2e78b24c947509c3 (diff) | |
| download | rust-1623ab0246deebec4fe32dc525d20bf8a88096f2.tar.gz rust-1623ab0246deebec4fe32dc525d20bf8a88096f2.zip | |
Auto merge of #107507 - BoxyUwU:deferred_projection_equality, r=lcnr
Implement `deferred_projection_equality` for erica solver Somewhat of a revival of #96912. When relating projections now emit an `AliasEq` obligation instead of attempting to determine equality of projections that may not be as normalized as possible (i.e. because of lazy norm, or just containing inference variables that prevent us from resolving an impl). Only do this when the new solver is enabled
Diffstat (limited to 'compiler/rustc_borrowck/src')
| -rw-r--r-- | compiler/rustc_borrowck/src/type_check/relate_tys.rs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/compiler/rustc_borrowck/src/type_check/relate_tys.rs b/compiler/rustc_borrowck/src/type_check/relate_tys.rs index b2702eafd33..8dd06187877 100644 --- a/compiler/rustc_borrowck/src/type_check/relate_tys.rs +++ b/compiler/rustc_borrowck/src/type_check/relate_tys.rs @@ -1,4 +1,4 @@ -use rustc_infer::infer::nll_relate::{NormalizationStrategy, TypeRelating, TypeRelatingDelegate}; +use rustc_infer::infer::nll_relate::{TypeRelating, TypeRelatingDelegate}; use rustc_infer::infer::NllRegionVariableOrigin; use rustc_infer::traits::PredicateObligations; use rustc_middle::mir::ConstraintCategory; @@ -140,10 +140,6 @@ impl<'tcx> TypeRelatingDelegate<'tcx> for NllTypeRelatingDelegate<'_, '_, 'tcx> ); } - fn normalization() -> NormalizationStrategy { - NormalizationStrategy::Eager - } - fn forbid_inference_vars() -> bool { true } |
