rustc_errors: remove struct_dummy.

2022-01-26 04:40:43 +00:00
parent d4fc5ae25c
commit 8562d6b752
7 changed files with 41 additions and 38 deletions
--- a/compiler/rustc_infer/src/infer/mod.rs
+++ b/compiler/rustc_infer/src/infer/mod.rs
@@ -1482,12 +1482,14 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
        let actual_ty = self.resolve_vars_if_possible(actual_ty);
        debug!("type_error_struct_with_diag({:?}, {:?})", sp, actual_ty);

+        let mut err = mk_diag(self.ty_to_string(actual_ty));
+
        // Don't report an error if actual type is `Error`.
        if actual_ty.references_error() {
-            return self.tcx.sess.diagnostic().struct_dummy();
+            err.downgrade_to_delayed_bug();
        }

-        mk_diag(self.ty_to_string(actual_ty))
+        err
    }

    pub fn report_mismatched_types(