@@ -525,9 +525,6 @@ pub struct DiagCtxtFlags {
525525 /// If true, immediately emit diagnostics that would otherwise be buffered.
526526 /// (rustc: see `-Z dont-buffer-diagnostics` and `-Z treat-err-as-bug`)
527527 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 ,
531528 /// Show macro backtraces.
532529 /// (rustc: see `-Z macro-backtrace`)
533530 pub macro_backtrace : bool ,
@@ -1004,7 +1001,6 @@ impl DiagCtxt {
10041001 ) -> ErrorGuaranteed {
10051002 let treat_next_err_as_bug = self . inner . borrow ( ) . treat_next_err_as_bug ( ) ;
10061003 if treat_next_err_as_bug {
1007- // FIXME: don't abort here if report_delayed_bugs is off
10081004 self . span_bug ( sp, msg) ;
10091005 }
10101006 let mut diagnostic = Diagnostic :: new ( DelayedBug , msg) ;
@@ -1016,11 +1012,7 @@ impl DiagCtxt {
10161012 // where the explanation of what "good path" is (also, it should be renamed).
10171013 pub fn good_path_delayed_bug ( & self , msg : impl Into < DiagnosticMessage > ) {
10181014 let mut inner = self . inner . borrow_mut ( ) ;
1019-
1020- let mut diagnostic = Diagnostic :: new ( DelayedBug , msg) ;
1021- if inner. flags . report_delayed_bugs {
1022- inner. emit_diagnostic_without_consuming ( & mut diagnostic) ;
1023- }
1015+ let diagnostic = Diagnostic :: new ( DelayedBug , msg) ;
10241016 let backtrace = std:: backtrace:: Backtrace :: capture ( ) ;
10251017 inner. good_path_delayed_bugs . push ( DelayedDiagnostic :: with_backtrace ( diagnostic, backtrace) ) ;
10261018 }
@@ -1430,10 +1422,8 @@ impl DiagCtxtInner {
14301422 self . span_delayed_bugs
14311423 . push ( DelayedDiagnostic :: with_backtrace ( diagnostic. clone ( ) , backtrace) ) ;
14321424
1433- if !self . flags . report_delayed_bugs {
1434- #[ allow( deprecated) ]
1435- return Some ( ErrorGuaranteed :: unchecked_claim_error_was_emitted ( ) ) ;
1436- }
1425+ #[ allow( deprecated) ]
1426+ return Some ( ErrorGuaranteed :: unchecked_claim_error_was_emitted ( ) ) ;
14371427 }
14381428
14391429 if diagnostic. has_future_breakage ( ) {
0 commit comments