to span_delayed_bug

Author: lcnr

compiler/rustc_borrowck/src/region_infer/opaque_types.rs

@@ -224,16 +224,15 @@ pub(crate) fn handle_opaque_type_uses<'tcx>(
         &opaque_types,
     );
 
-    if let Some((key, hidden_type)) = infcx
+    for (key, hidden_type) in infcx
         .inner
         .borrow_mut()
         .opaque_types()
         .opaque_types_added_since(opaque_types_storage_num_entries)
-        .next()
     {
         let opaque_type_string = tcx.def_path_str(key.def_id);
         let msg = format!("unexpected cyclic definition of `{opaque_type_string}`");
-        infcx.dcx().span_bug(hidden_type.span, msg);
+        infcx.dcx().span_delayed_bug(hidden_type.span, msg);
     }
 
     let _ = infcx.take_opaque_types();

compiler/rustc_hir_typeck/src/opaque_types.rs

@@ -132,12 +132,12 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
     /// then, either allowing compilation to succeed or causing an ambiguity error.
     pub(super) fn detect_opaque_types_added_during_writeback(&self) {
         let num_entries = self.checked_opaque_types_storage_entries.take().unwrap();
-        if let Some((key, hidden_type)) =
-            self.inner.borrow_mut().opaque_types().opaque_types_added_since(num_entries).next()
+        for (key, hidden_type) in
+            self.inner.borrow_mut().opaque_types().opaque_types_added_since(num_entries)
         {
             let opaque_type_string = self.tcx.def_path_str(key.def_id);
             let msg = format!("unexpected cyclic definition of `{opaque_type_string}`");
-            self.dcx().span_bug(hidden_type.span, msg);
+            self.dcx().span_delayed_bug(hidden_type.span, msg);
         }
         let _ = self.take_opaque_types();
     }