delay errors as bug

lcnr · lcnr · commit 003ed76e41e9 · 2022-11-08T14:48:07.000+01:00
diff --git a/compiler/rustc_trait_selection/src/traits/error_reporting/mod.rs b/compiler/rustc_trait_selection/src/traits/error_reporting/mod.rs
@@ -2146,15 +2146,15 @@ impl<'tcx> InferCtxtPrivExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
                             self.annotate_source_of_ambiguity(&mut err, &impls, predicate);
                         } else {
                             if self.is_tainted_by_errors() {
-                                err.cancel();
+                                err.delay_as_bug();
                                 return;
                             }
                             err.note(&format!("cannot satisfy `{}`", predicate));
                         }
                     }
                     _ => {
                         if self.is_tainted_by_errors() {
-                            err.cancel();
+                            err.delay_as_bug();
                             return;
                         }
                         err.note(&format!("cannot satisfy `{}`", predicate));

Original file line number	Diff line number	Diff line change
`@@ -2146,15 +2146,15 @@ impl<'tcx> InferCtxtPrivExt<'tcx> for TypeErrCtxt<'_, 'tcx> {`
`2146`	`2146`	`self.annotate_source_of_ambiguity(&mut err, &impls, predicate);`
`2147`	`2147`	`} else {`
`2148`	`2148`	`if self.is_tainted_by_errors() {`
`2149`		`- err.cancel();`
	`2149`	`+ err.delay_as_bug();`
`2150`	`2150`	`return;`
`2151`	`2151`	`}`
`2152`	`2152`	err.note(&format!("cannot satisfy `{}`", predicate));
`2153`	`2153`	`}`
`2154`	`2154`	`}`
`2155`	`2155`	`_ => {`
`2156`	`2156`	`if self.is_tainted_by_errors() {`
`2157`		`- err.cancel();`
	`2157`	`+ err.delay_as_bug();`
`2158`	`2158`	`return;`
`2159`	`2159`	`}`
`2160`	`2160`	err.note(&format!("cannot satisfy `{}`", predicate));