bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #115859 - compiler-errors:effect-fallback, r=fee1-dead

Browse source 
Fallback effects even if types also fallback

`||` is short circuiting, so if we do ty/int var fallback, we *don't* do effect fallback 😸

r? `@fee1-dead` or `@oli-obk`

Fixes #115791
Fixes #115842
This commit is contained in:
bors 2023-09-15 00:05:28 +00:00
commit ae9465fee3
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_hir_typeck/src/fallback.rs
View file

@ -24,7 +24,7 @@ impl<'tcx> FnCtxt<'_, 'tcx> {
self.fulfillment_cx.borrow_mut().pending_obligations()
);
let fallback_occured = self.fallback_types() || self.fallback_effects();
let fallback_occured = self.fallback_types() | self.fallback_effects();
if !fallback_occured {
return;