@@ -525,9 +525,6 @@ pub struct DiagCtxtFlags {
525
525
/// If true, immediately emit diagnostics that would otherwise be buffered.
526
526
/// (rustc: see `-Z dont-buffer-diagnostics` and `-Z treat-err-as-bug`)
527
527
pub dont_buffer_diagnostics : bool ,
528
- /// If true, immediately print bugs registered with `span_delayed_bug`.
529
- /// (rustc: see `-Z report-delayed-bugs`)
530
- pub report_delayed_bugs : bool ,
531
528
/// Show macro backtraces.
532
529
/// (rustc: see `-Z macro-backtrace`)
533
530
pub macro_backtrace : bool ,
@@ -994,7 +991,6 @@ impl DiagCtxt {
994
991
) -> ErrorGuaranteed {
995
992
let treat_next_err_as_bug = self . inner . borrow ( ) . treat_next_err_as_bug ( ) ;
996
993
if treat_next_err_as_bug {
997
- // FIXME: don't abort here if report_delayed_bugs is off
998
994
self . span_bug ( sp, msg) ;
999
995
}
1000
996
let mut diagnostic = Diagnostic :: new ( DelayedBug , msg) ;
@@ -1006,11 +1002,7 @@ impl DiagCtxt {
1006
1002
// where the explanation of what "good path" is (also, it should be renamed).
1007
1003
pub fn good_path_delayed_bug ( & self , msg : impl Into < DiagnosticMessage > ) {
1008
1004
let mut inner = self . inner . borrow_mut ( ) ;
1009
-
1010
- let mut diagnostic = Diagnostic :: new ( DelayedBug , msg) ;
1011
- if inner. flags . report_delayed_bugs {
1012
- inner. emit_diagnostic_without_consuming ( & mut diagnostic) ;
1013
- }
1005
+ let diagnostic = Diagnostic :: new ( DelayedBug , msg) ;
1014
1006
let backtrace = std:: backtrace:: Backtrace :: capture ( ) ;
1015
1007
inner. good_path_delayed_bugs . push ( DelayedDiagnostic :: with_backtrace ( diagnostic, backtrace) ) ;
1016
1008
}
@@ -1420,10 +1412,8 @@ impl DiagCtxtInner {
1420
1412
self . span_delayed_bugs
1421
1413
. push ( DelayedDiagnostic :: with_backtrace ( diagnostic. clone ( ) , backtrace) ) ;
1422
1414
1423
- if !self . flags . report_delayed_bugs {
1424
- #[ allow( deprecated) ]
1425
- return Some ( ErrorGuaranteed :: unchecked_claim_error_was_emitted ( ) ) ;
1426
- }
1415
+ #[ allow( deprecated) ]
1416
+ return Some ( ErrorGuaranteed :: unchecked_claim_error_was_emitted ( ) ) ;
1427
1417
}
1428
1418
1429
1419
if diagnostic. has_future_breakage ( ) {
0 commit comments