Skip to content

Commit dcb3508

Browse files
borsbors
committed
Auto merge of #120576 - nnethercote:merge-Diagnostic-DiagnosticBuilder, r=<try>
Overhaul `Diagnostic` and `DiagnosticBuilder` Implements the first part of rust-lang/compiler-team#722, which moves functionality and use away from `Diagnostic`, onto `DiagnosticBuilder`. Likely follow-ups: - Move things around, because this PR was written to minimize diff size, so some things end up in sub-optimal places. E.g. `DiagnosticBuilder` has impls in both `diagnostic.rs` and `diagnostic_builder.rs`. - Rename `Diagnostic` as `DiagInner` and `DiagnosticBuilder` as `Diag`. r? `@ghost`
2 parents 6894f43 + 40fb7d5 commit dcb3508

File tree

103 files changed

+1090
-1010
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+1090
-1010
lines changed

‎compiler/rustc_ast_lowering/src/errors.rs

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
use rustc_errors::{codes::*, DiagnosticArgFromDisplay};
1+
use rustc_errors::{
2+
codes::*, AddToDiagnostic, DiagnosticArgFromDisplay, DiagnosticBuilder, EmissionGuarantee,
3+
SubdiagnosticMessageOp,
4+
};
25
use rustc_macros::{Diagnostic, Subdiagnostic};
36
use rustc_span::{symbol::Ident, Span, Symbol};
47

@@ -38,14 +41,12 @@ pub struct InvalidAbi {
3841

3942
pub struct InvalidAbiReason(pub &'static str);
4043

41-
impl rustc_errors::AddToDiagnostic for InvalidAbiReason {
42-
fn add_to_diagnostic_with<F>(self, diag: &mut rustc_errors::Diagnostic, _: F)
43-
where
44-
F: Fn(
45-
&mut rustc_errors::Diagnostic,
46-
rustc_errors::SubdiagnosticMessage,
47-
) -> rustc_errors::SubdiagnosticMessage,
48-
{
44+
impl AddToDiagnostic for InvalidAbiReason {
45+
fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagnosticMessageOp<G>>(
46+
self,
47+
diag: &mut DiagnosticBuilder<'_, G>,
48+
_: F,
49+
) {
4950
#[allow(rustc::untranslatable_diagnostic)]
5051
diag.note(self.0);
5152
}

‎compiler/rustc_ast_passes/src/errors.rs

+14-15
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
//! Errors emitted by ast_passes.
22
33
use rustc_ast::ParamKindOrd;
4-
use rustc_errors::{codes::*, AddToDiagnostic, Applicability};
4+
use rustc_errors::{
5+
codes::*, AddToDiagnostic, Applicability, DiagnosticBuilder, EmissionGuarantee,
6+
SubdiagnosticMessageOp,
7+
};
58
use rustc_macros::{Diagnostic, Subdiagnostic};
69
use rustc_span::{symbol::Ident, Span, Symbol};
710

@@ -372,13 +375,11 @@ pub struct EmptyLabelManySpans(pub Vec<Span>);
372375

373376
// The derive for `Vec<Span>` does multiple calls to `span_label`, adding commas between each
374377
impl AddToDiagnostic for EmptyLabelManySpans {
375-
fn add_to_diagnostic_with<F>(self, diag: &mut rustc_errors::Diagnostic, _: F)
376-
where
377-
F: Fn(
378-
&mut rustc_errors::Diagnostic,
379-
rustc_errors::SubdiagnosticMessage,
380-
) -> rustc_errors::SubdiagnosticMessage,
381-
{
378+
fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagnosticMessageOp<G>>(
379+
self,
380+
diag: &mut DiagnosticBuilder<'_, G>,
381+
_: F,
382+
) {
382383
diag.span_labels(self.0, "");
383384
}
384385
}
@@ -735,13 +736,11 @@ pub struct StableFeature {
735736
}
736737

737738
impl AddToDiagnostic for StableFeature {
738-
fn add_to_diagnostic_with<F>(self, diag: &mut rustc_errors::Diagnostic, _: F)
739-
where
740-
F: Fn(
741-
&mut rustc_errors::Diagnostic,
742-
rustc_errors::SubdiagnosticMessage,
743-
) -> rustc_errors::SubdiagnosticMessage,
744-
{
739+
fn add_to_diagnostic_with<G: EmissionGuarantee, F: SubdiagnosticMessageOp<G>>(
740+
self,
741+
diag: &mut DiagnosticBuilder<'_, G>,
742+
_: F,
743+
) {
745744
diag.arg("name", self.name);
746745
diag.arg("since", self.since);
747746
diag.help(fluent::ast_passes_stable_since);

‎compiler/rustc_ast_passes/src/feature_gate.rs

+3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ macro_rules! gate {
2222
}};
2323
($visitor:expr, $feature:ident, $span:expr, $explain:expr, $help:expr) => {{
2424
if !$visitor.features.$feature && !$span.allows_unstable(sym::$feature) {
25+
// FIXME: make this translatable
26+
#[allow(rustc::diagnostic_outside_of_impl)]
27+
#[allow(rustc::untranslatable_diagnostic)]
2528
feature_err(&$visitor.sess, sym::$feature, $span, $explain).with_help($help).emit();
2629
}
2730
}};

‎compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

+21-14
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
use either::Either;
44
use rustc_data_structures::captures::Captures;
55
use rustc_data_structures::fx::FxIndexSet;
6-
use rustc_errors::{
7-
codes::*, struct_span_code_err, Applicability, Diagnostic, DiagnosticBuilder, MultiSpan,
8-
};
6+
use rustc_errors::{codes::*, struct_span_code_err, Applicability, DiagnosticBuilder, MultiSpan};
97
use rustc_hir as hir;
108
use rustc_hir::def::{DefKind, Res};
119
use rustc_hir::intravisit::{walk_block, walk_expr, Visitor};
@@ -633,7 +631,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
633631

634632
fn suggest_assign_value(
635633
&self,
636-
err: &mut Diagnostic,
634+
err: &mut DiagnosticBuilder<'_>,
637635
moved_place: PlaceRef<'tcx>,
638636
sugg_span: Span,
639637
) {
@@ -672,7 +670,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
672670

673671
fn suggest_borrow_fn_like(
674672
&self,
675-
err: &mut Diagnostic,
673+
err: &mut DiagnosticBuilder<'_>,
676674
ty: Ty<'tcx>,
677675
move_sites: &[MoveSite],
678676
value_name: &str,
@@ -740,7 +738,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
740738

741739
fn suggest_cloning(
742740
&self,
743-
err: &mut Diagnostic,
741+
err: &mut DiagnosticBuilder<'_>,
744742
ty: Ty<'tcx>,
745743
expr: &hir::Expr<'_>,
746744
span: Span,
@@ -776,7 +774,12 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
776774
}
777775
}
778776

779-
fn suggest_adding_copy_bounds(&self, err: &mut Diagnostic, ty: Ty<'tcx>, span: Span) {
777+
fn suggest_adding_copy_bounds(
778+
&self,
779+
err: &mut DiagnosticBuilder<'_>,
780+
ty: Ty<'tcx>,
781+
span: Span,
782+
) {
780783
let tcx = self.infcx.tcx;
781784
let generics = tcx.generics_of(self.mir_def_id());
782785

@@ -1210,7 +1213,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
12101213
#[instrument(level = "debug", skip(self, err))]
12111214
fn suggest_using_local_if_applicable(
12121215
&self,
1213-
err: &mut Diagnostic,
1216+
err: &mut DiagnosticBuilder<'_>,
12141217
location: Location,
12151218
issued_borrow: &BorrowData<'tcx>,
12161219
explanation: BorrowExplanation<'tcx>,
@@ -1306,7 +1309,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
13061309

13071310
fn suggest_slice_method_if_applicable(
13081311
&self,
1309-
err: &mut Diagnostic,
1312+
err: &mut DiagnosticBuilder<'_>,
13101313
place: Place<'tcx>,
13111314
borrowed_place: Place<'tcx>,
13121315
) {
@@ -1415,7 +1418,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
14151418
/// ```
14161419
pub(crate) fn explain_iterator_advancement_in_for_loop_if_applicable(
14171420
&self,
1418-
err: &mut Diagnostic,
1421+
err: &mut DiagnosticBuilder<'_>,
14191422
span: Span,
14201423
issued_spans: &UseSpans<'tcx>,
14211424
) {
@@ -1602,7 +1605,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
16021605
/// ```
16031606
fn suggest_using_closure_argument_instead_of_capture(
16041607
&self,
1605-
err: &mut Diagnostic,
1608+
err: &mut DiagnosticBuilder<'_>,
16061609
borrowed_place: Place<'tcx>,
16071610
issued_spans: &UseSpans<'tcx>,
16081611
) {
@@ -1737,7 +1740,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
17371740

17381741
fn suggest_binding_for_closure_capture_self(
17391742
&self,
1740-
err: &mut Diagnostic,
1743+
err: &mut DiagnosticBuilder<'_>,
17411744
issued_spans: &UseSpans<'tcx>,
17421745
) {
17431746
let UseSpans::ClosureUse { capture_kind_span, .. } = issued_spans else { return };
@@ -2984,7 +2987,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
29842987
self.buffer_error(err);
29852988
}
29862989

2987-
fn explain_deref_coercion(&mut self, loan: &BorrowData<'tcx>, err: &mut Diagnostic) {
2990+
fn explain_deref_coercion(&mut self, loan: &BorrowData<'tcx>, err: &mut DiagnosticBuilder<'_>) {
29882991
let tcx = self.infcx.tcx;
29892992
if let (
29902993
Some(Terminator {
@@ -3520,7 +3523,11 @@ enum AnnotatedBorrowFnSignature<'tcx> {
35203523
impl<'tcx> AnnotatedBorrowFnSignature<'tcx> {
35213524
/// Annotate the provided diagnostic with information about borrow from the fn signature that
35223525
/// helps explain.
3523-
pub(crate) fn emit(&self, cx: &mut MirBorrowckCtxt<'_, 'tcx>, diag: &mut Diagnostic) -> String {
3526+
pub(crate) fn emit(
3527+
&self,
3528+
cx: &mut MirBorrowckCtxt<'_, 'tcx>,
3529+
diag: &mut DiagnosticBuilder<'_>,
3530+
) -> String {
35243531
match self {
35253532
&AnnotatedBorrowFnSignature::Closure { argument_ty, argument_span } => {
35263533
diag.span_label(

‎compiler/rustc_borrowck/src/diagnostics/explain_borrow.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! Print diagnostics to explain why values are borrowed.
22
3-
use rustc_errors::{Applicability, Diagnostic};
3+
use rustc_errors::{Applicability, DiagnosticBuilder};
44
use rustc_hir as hir;
55
use rustc_hir::intravisit::Visitor;
66
use rustc_index::IndexSlice;
@@ -62,7 +62,7 @@ impl<'tcx> BorrowExplanation<'tcx> {
6262
tcx: TyCtxt<'tcx>,
6363
body: &Body<'tcx>,
6464
local_names: &IndexSlice<Local, Option<Symbol>>,
65-
err: &mut Diagnostic,
65+
err: &mut DiagnosticBuilder<'_>,
6666
borrow_desc: &str,
6767
borrow_span: Option<Span>,
6868
multiple_borrow_span: Option<(Span, Span)>,
@@ -303,7 +303,7 @@ impl<'tcx> BorrowExplanation<'tcx> {
303303
fn add_object_lifetime_default_note(
304304
&self,
305305
tcx: TyCtxt<'tcx>,
306-
err: &mut Diagnostic,
306+
err: &mut DiagnosticBuilder<'_>,
307307
unsize_ty: Ty<'tcx>,
308308
) {
309309
if let ty::Adt(def, args) = unsize_ty.kind() {
@@ -356,7 +356,7 @@ impl<'tcx> BorrowExplanation<'tcx> {
356356

357357
fn add_lifetime_bound_suggestion_to_diagnostic(
358358
&self,
359-
err: &mut Diagnostic,
359+
err: &mut DiagnosticBuilder<'_>,
360360
category: &ConstraintCategory<'tcx>,
361361
span: Span,
362362
region_name: &RegionName,

‎compiler/rustc_borrowck/src/diagnostics/mod.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use crate::session_diagnostics::{
55
CaptureVarKind, CaptureVarPathUseCause, OnClosureNote,
66
};
77
use itertools::Itertools;
8-
use rustc_errors::{Applicability, Diagnostic};
8+
use rustc_errors::{Applicability, DiagnosticBuilder};
99
use rustc_hir as hir;
1010
use rustc_hir::def::{CtorKind, Namespace};
1111
use rustc_hir::CoroutineKind;
@@ -80,7 +80,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
8080
&self,
8181
location: Location,
8282
place: PlaceRef<'tcx>,
83-
diag: &mut Diagnostic,
83+
diag: &mut DiagnosticBuilder<'_>,
8484
) -> bool {
8585
debug!("add_moved_or_invoked_closure_note: location={:?} place={:?}", location, place);
8686
let mut target = place.local_or_deref_local();
@@ -587,7 +587,7 @@ impl UseSpans<'_> {
587587
/// Add a span label to the arguments of the closure, if it exists.
588588
pub(super) fn args_subdiag(
589589
self,
590-
err: &mut Diagnostic,
590+
err: &mut DiagnosticBuilder<'_>,
591591
f: impl FnOnce(Span) -> CaptureArgLabel,
592592
) {
593593
if let UseSpans::ClosureUse { args_span, .. } = self {
@@ -599,7 +599,7 @@ impl UseSpans<'_> {
599599
/// only adds label to the `path_span`
600600
pub(super) fn var_path_only_subdiag(
601601
self,
602-
err: &mut Diagnostic,
602+
err: &mut DiagnosticBuilder<'_>,
603603
action: crate::InitializationRequiringAction,
604604
) {
605605
use crate::InitializationRequiringAction::*;
@@ -630,7 +630,7 @@ impl UseSpans<'_> {
630630
pub(super) fn var_subdiag(
631631
self,
632632
dcx: Option<&rustc_errors::DiagCtxt>,
633-
err: &mut Diagnostic,
633+
err: &mut DiagnosticBuilder<'_>,
634634
kind: Option<rustc_middle::mir::BorrowKind>,
635635
f: impl FnOnce(hir::ClosureKind, Span) -> CaptureVarCause,
636636
) {
@@ -1002,7 +1002,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
10021002

10031003
fn explain_captures(
10041004
&mut self,
1005-
err: &mut Diagnostic,
1005+
err: &mut DiagnosticBuilder<'_>,
10061006
span: Span,
10071007
move_span: Span,
10081008
move_spans: UseSpans<'tcx>,

‎compiler/rustc_borrowck/src/diagnostics/move_errors.rs

+11-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use rustc_errors::{Applicability, Diagnostic, DiagnosticBuilder};
1+
use rustc_errors::{Applicability, DiagnosticBuilder};
22
use rustc_middle::mir::*;
33
use rustc_middle::ty::{self, Ty};
44
use rustc_mir_dataflow::move_paths::{LookupResult, MovePathIndex};
@@ -434,7 +434,12 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
434434
err
435435
}
436436

437-
fn add_move_hints(&self, error: GroupedMoveError<'tcx>, err: &mut Diagnostic, span: Span) {
437+
fn add_move_hints(
438+
&self,
439+
error: GroupedMoveError<'tcx>,
440+
err: &mut DiagnosticBuilder<'_>,
441+
span: Span,
442+
) {
438443
match error {
439444
GroupedMoveError::MovesFromPlace { mut binds_to, move_from, .. } => {
440445
self.add_borrow_suggestions(err, span);
@@ -491,7 +496,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
491496
}
492497
}
493498

494-
fn add_borrow_suggestions(&self, err: &mut Diagnostic, span: Span) {
499+
fn add_borrow_suggestions(&self, err: &mut DiagnosticBuilder<'_>, span: Span) {
495500
match self.infcx.tcx.sess.source_map().span_to_snippet(span) {
496501
Ok(snippet) if snippet.starts_with('*') => {
497502
err.span_suggestion_verbose(
@@ -512,7 +517,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
512517
}
513518
}
514519

515-
fn add_move_error_suggestions(&self, err: &mut Diagnostic, binds_to: &[Local]) {
520+
fn add_move_error_suggestions(&self, err: &mut DiagnosticBuilder<'_>, binds_to: &[Local]) {
516521
let mut suggestions: Vec<(Span, String, String)> = Vec::new();
517522
for local in binds_to {
518523
let bind_to = &self.body.local_decls[*local];
@@ -564,7 +569,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
564569
}
565570
}
566571

567-
fn add_move_error_details(&self, err: &mut Diagnostic, binds_to: &[Local]) {
572+
fn add_move_error_details(&self, err: &mut DiagnosticBuilder<'_>, binds_to: &[Local]) {
568573
for (j, local) in binds_to.iter().enumerate() {
569574
let bind_to = &self.body.local_decls[*local];
570575
let binding_span = bind_to.source_info.span;
@@ -598,7 +603,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
598603
/// expansion of a packed struct.
599604
/// Such errors happen because derive macro expansions shy away from taking
600605
/// references to the struct's fields since doing so would be undefined behaviour
601-
fn add_note_for_packed_struct_derive(&self, err: &mut Diagnostic, local: Local) {
606+
fn add_note_for_packed_struct_derive(&self, err: &mut DiagnosticBuilder<'_>, local: Local) {
602607
let local_place: PlaceRef<'tcx> = local.into();
603608
let local_ty = local_place.ty(self.body.local_decls(), self.infcx.tcx).ty.peel_refs();
604609

0 commit comments

Comments
 (0)