diff options
| author | Michael Goulet <michael@errs.io> | 2023-05-09 18:56:43 +0000 |
|---|---|---|
| committer | Michael Goulet <michael@errs.io> | 2023-05-25 03:19:15 +0000 |
| commit | 4d80b8090c30980c03ff4bb6f47a7560ffaa68a4 (patch) | |
| tree | d45cf4788222a3542ea503f8083f516ecbb04855 /compiler/rustc_infer/src/infer/combine.rs | |
| parent | 7664dfe4331265d0b2b1ffb89c92d443886bec0b (diff) | |
| download | rust-4d80b8090c30980c03ff4bb6f47a7560ffaa68a4.tar.gz rust-4d80b8090c30980c03ff4bb6f47a7560ffaa68a4.zip | |
Pull out logic from #111131, plus some new logic in EvalCtxt::normalize_opaque_type
Co-authored-by: lcnr <rust@lcnr.de>
Diffstat (limited to 'compiler/rustc_infer/src/infer/combine.rs')
| -rw-r--r-- | compiler/rustc_infer/src/infer/combine.rs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/compiler/rustc_infer/src/infer/combine.rs b/compiler/rustc_infer/src/infer/combine.rs index 79fc02c6c79..b6b935de68c 100644 --- a/compiler/rustc_infer/src/infer/combine.rs +++ b/compiler/rustc_infer/src/infer/combine.rs @@ -113,10 +113,7 @@ impl<'tcx> InferCtxt<'tcx> { bug!() } - (_, ty::Alias(AliasKind::Projection | AliasKind::Inherent, _)) - | (ty::Alias(AliasKind::Projection | AliasKind::Inherent, _), _) - if self.tcx.trait_solver_next() => - { + (_, ty::Alias(..)) | (ty::Alias(..), _) if self.tcx.trait_solver_next() => { relation.register_type_relate_obligation(a, b); Ok(a) } |