bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Deduplicate the error printing code for hidden type mismatches

Browse source
This commit is contained in:
Oli Scherer 2022-04-07 13:52:59 +00:00
parent 25876b3541
commit 7d2cad68d2
3 changed files with 24 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

16
compiler/rustc_typeck/src/collect/type_of.rs
View file

@ -601,21 +601,7 @@ fn find_opaque_ty_constraints(tcx: TyCtxt<'_>, def_id: LocalDefId) -> Ty<'_> {
if let Some(prev) = self.found {
if concrete_type.ty != prev.ty && !(concrete_type, prev).references_error() {
// Found different concrete types for the opaque type.
let mut err = self.tcx.sess.struct_span_err(
concrete_type.span,
"concrete type differs from previous defining opaque type use",
);
err.span_label(
concrete_type.span,
format!("expected `{}`, got `{}`", prev.ty, concrete_type.ty),
);
if prev.span == concrete_type.span {
err.span_label(prev.span, "this expression supplies two conflicting concrete types for the same opaque type");
} else {
err.span_note(prev.span, "previous use here");
}
err.emit();
prev.report_mismatch(&concrete_type, self.tcx);
}
} else {
self.found = Some(concrete_type);