diff options
| author | bors <bors@rust-lang.org> | 2023-07-07 05:28:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-07-07 05:28:17 +0000 |
| commit | 7cc3da05f99fbc89782fc6cb7e207fa11aa6add5 (patch) | |
| tree | f269363207938c9b6d2e6df90cdd9c0c6dc35434 /compiler/rustc_hir_analysis/src | |
| parent | bb548f964572f7fe652716f5897d9050a31c936e (diff) | |
| parent | 45cb1ba9d30452fc332fa28bdda06ac86e80fe25 (diff) | |
| download | rust-7cc3da05f99fbc89782fc6cb7e207fa11aa6add5.tar.gz rust-7cc3da05f99fbc89782fc6cb7e207fa11aa6add5.zip | |
Auto merge of #113429 - compiler-errors:rollup-wkv4w9a, r=compiler-errors
Rollup of 8 pull requests Successful merges: - #111917 (Simplify duplicate checks for mir validator) - #112008 (Fix incorrect documented default bufsize in bufreader/writer) - #112825 (Don't call `type_of` on TAIT in defining scope in new solver) - #113164 (Add a regression test for #109054) - #113318 (Revert "alloc: Allow comparing Boxs over different allocators", add regression test) - #113397 (Prefer object candidates in new selection) - #113419 (Avoid calling item_name for RPITIT) - #113421 (Do not assert >1 RPITITs on collect_return_position_impl_trait_in_trait_tys) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_hir_analysis/src')
| -rw-r--r-- | compiler/rustc_hir_analysis/src/check/compare_impl_item.rs | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/compiler/rustc_hir_analysis/src/check/compare_impl_item.rs b/compiler/rustc_hir_analysis/src/check/compare_impl_item.rs index 2999e1fd89b..22e576e345e 100644 --- a/compiler/rustc_hir_analysis/src/check/compare_impl_item.rs +++ b/compiler/rustc_hir_analysis/src/check/compare_impl_item.rs @@ -669,11 +669,13 @@ pub(super) fn collect_return_position_impl_trait_in_trait_tys<'tcx>( ) .fold_with(&mut collector); - debug_assert_ne!( - collector.types.len(), - 0, - "expect >1 RPITITs in call to `collect_return_position_impl_trait_in_trait_tys`" - ); + if !unnormalized_trait_sig.output().references_error() { + debug_assert_ne!( + collector.types.len(), + 0, + "expect >1 RPITITs in call to `collect_return_position_impl_trait_in_trait_tys`" + ); + } let trait_sig = ocx.normalize(&norm_cause, param_env, unnormalized_trait_sig); trait_sig.error_reported()?; |
