diff options
| -rw-r--r-- | compiler/rustc_infer/src/infer/equate.rs | 18 | ||||
| -rw-r--r-- | compiler/rustc_infer/src/infer/sub.rs | 19 | ||||
| -rw-r--r-- | src/test/ui/higher-rank-trait-bounds/issue-95034.rs | 20 | ||||
| -rw-r--r-- | src/test/ui/higher-rank-trait-bounds/issue-95034.stderr | 1 |
4 files changed, 38 insertions, 20 deletions
diff --git a/compiler/rustc_infer/src/infer/equate.rs b/compiler/rustc_infer/src/infer/equate.rs index 3b1798ca737..a962bbb03ad 100644 --- a/compiler/rustc_infer/src/infer/equate.rs +++ b/compiler/rustc_infer/src/infer/equate.rs @@ -110,6 +110,24 @@ impl<'tcx> TypeRelation<'tcx> for Equate<'_, '_, 'tcx> { .obligations, ); } + (&ty::GeneratorWitness(a_types), &ty::GeneratorWitness(b_types)) => { + let a_types = infcx.tcx.anonymize_bound_vars(a_types); + let b_types = infcx.tcx.anonymize_bound_vars(b_types); + if a_types.bound_vars() == b_types.bound_vars() { + let (a_types, b_types) = infcx.replace_bound_vars_with_placeholders( + a_types.map_bound(|a_types| (a_types, b_types.skip_binder())), + ); + for (a, b) in std::iter::zip(a_types, b_types) { + self.relate(a, b)?; + } + } else { + self.fields.infcx.super_combine_tys( + self, + infcx.tcx.mk_generator_witness(a_types), + infcx.tcx.mk_generator_witness(b_types), + )?; + } + } _ => { self.fields.infcx.super_combine_tys(self, a, b)?; diff --git a/compiler/rustc_infer/src/infer/sub.rs b/compiler/rustc_infer/src/infer/sub.rs index b7eab5d4328..2c14a9414f2 100644 --- a/compiler/rustc_infer/src/infer/sub.rs +++ b/compiler/rustc_infer/src/infer/sub.rs @@ -164,6 +164,25 @@ impl<'tcx> TypeRelation<'tcx> for Sub<'_, '_, 'tcx> { ); Ok(ga) } + (&ty::GeneratorWitness(a_types), &ty::GeneratorWitness(b_types)) => { + let a_types = infcx.tcx.anonymize_bound_vars(a_types); + let b_types = infcx.tcx.anonymize_bound_vars(b_types); + if a_types.bound_vars() == b_types.bound_vars() { + let (a_types, b_types) = infcx.replace_bound_vars_with_placeholders( + a_types.map_bound(|a_types| (a_types, b_types.skip_binder())), + ); + for (a, b) in std::iter::zip(a_types, b_types) { + self.relate(a, b)?; + } + } else { + self.fields.infcx.super_combine_tys( + self, + infcx.tcx.mk_generator_witness(a_types), + infcx.tcx.mk_generator_witness(b_types), + )?; + } + Ok(a) + } _ => { self.fields.infcx.super_combine_tys(self, a, b)?; diff --git a/src/test/ui/higher-rank-trait-bounds/issue-95034.rs b/src/test/ui/higher-rank-trait-bounds/issue-95034.rs index d8edbe7e56b..af4946a187f 100644 --- a/src/test/ui/higher-rank-trait-bounds/issue-95034.rs +++ b/src/test/ui/higher-rank-trait-bounds/issue-95034.rs @@ -1,23 +1,5 @@ -// known-bug: #95034 -// failure-status: 101 +// check-pass // compile-flags: --edition=2021 --crate-type=lib -// rustc-env:RUST_BACKTRACE=0 - -// normalize-stderr-test "thread 'rustc' panicked.*" -> "thread 'rustc' panicked" -// normalize-stderr-test "note:.*RUST_BACKTRACE=1.*\n" -> "" -// normalize-stderr-test "\nerror: internal compiler error.*\n\n" -> "" -// normalize-stderr-test "note:.*unexpectedly panicked.*\n\n" -> "" -// normalize-stderr-test "note: we would appreciate a bug report.*\n\n" -> "" -// normalize-stderr-test "note: compiler flags.*\n\n" -> "" -// normalize-stderr-test "note: rustc.*running on.*\n\n" -> "" -// normalize-stderr-test "query stack during panic:\n" -> "" -// normalize-stderr-test "we're just showing a limited slice of the query stack\n" -> "" -// normalize-stderr-test "end of query stack\n" -> "" -// normalize-stderr-test "#.*\n" -> "" - -// This should not ICE. - -// Refer to the issue for more minimized versions. use std::{ future::Future, diff --git a/src/test/ui/higher-rank-trait-bounds/issue-95034.stderr b/src/test/ui/higher-rank-trait-bounds/issue-95034.stderr deleted file mode 100644 index 1d8329142fc..00000000000 --- a/src/test/ui/higher-rank-trait-bounds/issue-95034.stderr +++ /dev/null @@ -1 +0,0 @@ -thread 'rustc' panicked |