bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #112654 - aliemjay:closure-output-normalize, r=compiler-errors

Browse source 
normalize closure output in equate_inputs_and_outputs

Fixes #112604
This commit is contained in:
Guillaume Gomez 2023-06-15 22:04:57 +02:00 • committed by GitHub
commit 6b9b55ac98
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 50 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

16
compiler/rustc_borrowck/src/type_check/input_output.rs
View file

@ -124,21 +124,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
// Return types are a bit more complex. They may contain opaque `impl Trait` types.
let mir_output_ty = body.local_decls[RETURN_PLACE].ty;
let output_span = body.local_decls[RETURN_PLACE].source_info.span;
if let Err(terr) = self.eq_types(
normalized_output_ty,
mir_output_ty,
Locations::All(output_span),
ConstraintCategory::BoringNoLocation,
) {
span_mirbug!(
self,
Location::START,
"equate_inputs_and_outputs: `{:?}=={:?}` failed with `{:?}`",
normalized_output_ty,
mir_output_ty,
terr
);
};
self.equate_normalized_input_or_output(normalized_output_ty, mir_output_ty, output_span);
}
#[instrument(skip(self), level = "debug")]