Skip to content

Commit cbeb244

Browse files
author
mejrs
committed
Add more track_caller
1 parent 0f35c0c commit cbeb244

File tree

13 files changed

+68
-3
lines changed

13 files changed

+68
-3
lines changed

‎compiler/rustc_errors/src/lib.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -763,6 +763,7 @@ impl Handler {
763763

764764
/// Construct a builder at the `Allow` level with the `msg`.
765765
#[rustc_lint_diagnostics]
766+
#[track_caller]
766767
pub fn struct_allow(&self, msg: impl Into<DiagnosticMessage>) -> DiagnosticBuilder<'_, ()> {
767768
DiagnosticBuilder::new(self, Level::Allow, msg)
768769
}
@@ -864,6 +865,7 @@ impl Handler {
864865

865866
/// Construct a builder at the `Fatal` level at the given `span`, with the `msg`, and `code`.
866867
#[rustc_lint_diagnostics]
868+
#[track_caller]
867869
pub fn struct_span_fatal_with_code(
868870
&self,
869871
span: impl Into<MultiSpan>,
@@ -877,6 +879,7 @@ impl Handler {
877879

878880
/// Construct a builder at the `Error` level with the `msg`.
879881
#[rustc_lint_diagnostics]
882+
#[track_caller]
880883
pub fn struct_fatal(&self, msg: impl Into<DiagnosticMessage>) -> DiagnosticBuilder<'_, !> {
881884
DiagnosticBuilder::new_fatal(self, msg)
882885
}
@@ -898,6 +901,7 @@ impl Handler {
898901
}
899902

900903
#[rustc_lint_diagnostics]
904+
#[track_caller]
901905
pub fn span_fatal(&self, span: impl Into<MultiSpan>, msg: impl Into<DiagnosticMessage>) -> ! {
902906
self.emit_diag_at_span(Diagnostic::new(Fatal, msg), span);
903907
FatalError.raise()
@@ -956,7 +960,6 @@ impl Handler {
956960
self.emit_diag_at_span(Diagnostic::new_with_code(Warning(None), Some(code), msg), span);
957961
}
958962

959-
#[track_caller]
960963
pub fn span_bug(&self, span: impl Into<MultiSpan>, msg: impl Into<DiagnosticMessage>) -> ! {
961964
self.inner.borrow_mut().span_bug(span, msg)
962965
}
@@ -972,7 +975,6 @@ impl Handler {
972975

973976
// FIXME(eddyb) note the comment inside `impl Drop for HandlerInner`, that's
974977
// where the explanation of what "good path" is (also, it should be renamed).
975-
#[track_caller]
976978
pub fn delay_good_path_bug(&self, msg: impl Into<DiagnosticMessage>) {
977979
self.inner.borrow_mut().delay_good_path_bug(msg)
978980
}

‎compiler/rustc_hir_analysis/src/errors.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@ pub struct MissingTypeParams {
252252

253253
// Manual implementation of `IntoDiagnostic` to be able to call `span_to_snippet`.
254254
impl<'a> IntoDiagnostic<'a> for MissingTypeParams {
255+
#[track_caller]
255256
fn into_diagnostic(self, handler: &'a Handler) -> DiagnosticBuilder<'a, ErrorGuaranteed> {
256257
let mut err = handler.struct_span_err_with_code(
257258
self.span,

‎compiler/rustc_macros/src/diagnostics/diagnostic.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ impl<'a> DiagnosticDerive<'a> {
6969
for @Self
7070
where G: rustc_errors::EmissionGuarantee
7171
{
72+
73+
#[track_caller]
7274
fn into_diagnostic(
7375
self,
7476
#handler: &'__diagnostic_handler_sess rustc_errors::Handler
@@ -133,6 +135,7 @@ impl<'a> LintDiagnosticDerive<'a> {
133135
let diag = &builder.diag;
134136
structure.gen_impl(quote! {
135137
gen impl<'__a> rustc_errors::DecorateLint<'__a, ()> for @Self {
138+
#[track_caller]
136139
fn decorate_lint<'__b>(
137140
self,
138141
#diag: &'__b mut rustc_errors::DiagnosticBuilder<'__a, ()>

‎compiler/rustc_metadata/src/errors.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -578,6 +578,7 @@ pub struct InvalidMetadataFiles {
578578
}
579579

580580
impl IntoDiagnostic<'_> for InvalidMetadataFiles {
581+
#[track_caller]
581582
fn into_diagnostic(
582583
self,
583584
handler: &'_ rustc_errors::Handler,
@@ -606,6 +607,7 @@ pub struct CannotFindCrate {
606607
}
607608

608609
impl IntoDiagnostic<'_> for CannotFindCrate {
610+
#[track_caller]
609611
fn into_diagnostic(
610612
self,
611613
handler: &'_ rustc_errors::Handler,

‎compiler/rustc_monomorphize/src/errors.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ pub struct UnusedGenericParams {
4545
}
4646

4747
impl IntoDiagnostic<'_> for UnusedGenericParams {
48+
#[track_caller]
4849
fn into_diagnostic(
4950
self,
5051
handler: &'_ rustc_errors::Handler,

‎compiler/rustc_parse/src/errors.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -930,6 +930,7 @@ pub(crate) struct ExpectedIdentifier {
930930
}
931931

932932
impl<'a, G: EmissionGuarantee> IntoDiagnostic<'a, G> for ExpectedIdentifier {
933+
#[track_caller]
933934
fn into_diagnostic(
934935
self,
935936
handler: &'a rustc_errors::Handler,
@@ -977,6 +978,7 @@ pub(crate) struct ExpectedSemi {
977978
}
978979

979980
impl<'a, G: EmissionGuarantee> IntoDiagnostic<'a, G> for ExpectedSemi {
981+
#[track_caller]
980982
fn into_diagnostic(
981983
self,
982984
handler: &'a rustc_errors::Handler,

‎compiler/rustc_passes/src/errors.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -744,6 +744,7 @@ pub struct InvalidAttrAtCrateLevel {
744744
}
745745

746746
impl IntoDiagnostic<'_> for InvalidAttrAtCrateLevel {
747+
#[track_caller]
747748
fn into_diagnostic(
748749
self,
749750
handler: &'_ rustc_errors::Handler,
@@ -877,6 +878,7 @@ pub struct BreakNonLoop<'a> {
877878
}
878879

879880
impl<'a> IntoDiagnostic<'_> for BreakNonLoop<'a> {
881+
#[track_caller]
880882
fn into_diagnostic(
881883
self,
882884
handler: &rustc_errors::Handler,
@@ -1014,6 +1016,7 @@ pub struct NakedFunctionsAsmBlock {
10141016
}
10151017

10161018
impl IntoDiagnostic<'_> for NakedFunctionsAsmBlock {
1019+
#[track_caller]
10171020
fn into_diagnostic(
10181021
self,
10191022
handler: &rustc_errors::Handler,
@@ -1137,6 +1140,7 @@ pub struct NoMainErr {
11371140
}
11381141

11391142
impl<'a> IntoDiagnostic<'a> for NoMainErr {
1143+
#[track_caller]
11401144
fn into_diagnostic(
11411145
self,
11421146
handler: &'a rustc_errors::Handler,
@@ -1197,6 +1201,7 @@ pub struct DuplicateLangItem {
11971201
}
11981202

11991203
impl IntoDiagnostic<'_> for DuplicateLangItem {
1204+
#[track_caller]
12001205
fn into_diagnostic(
12011206
self,
12021207
handler: &rustc_errors::Handler,

‎compiler/rustc_session/src/parse.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ pub fn feature_err<'a>(
9797
///
9898
/// This variant allows you to control whether it is a library or language feature.
9999
/// Almost always, you want to use this for a language feature. If so, prefer `feature_err`.
100+
#[track_caller]
100101
pub fn feature_err_issue<'a>(
101102
sess: &'a ParseSess,
102103
feature: Symbol,
@@ -332,24 +333,28 @@ impl ParseSess {
332333
self.proc_macro_quoted_spans.lock().clone()
333334
}
334335

336+
#[track_caller]
335337
pub fn create_err<'a>(
336338
&'a self,
337339
err: impl IntoDiagnostic<'a>,
338340
) -> DiagnosticBuilder<'a, ErrorGuaranteed> {
339341
err.into_diagnostic(&self.span_diagnostic)
340342
}
341343

344+
#[track_caller]
342345
pub fn emit_err<'a>(&'a self, err: impl IntoDiagnostic<'a>) -> ErrorGuaranteed {
343346
self.create_err(err).emit()
344347
}
345348

349+
#[track_caller]
346350
pub fn create_warning<'a>(
347351
&'a self,
348352
warning: impl IntoDiagnostic<'a, ()>,
349353
) -> DiagnosticBuilder<'a, ()> {
350354
warning.into_diagnostic(&self.span_diagnostic)
351355
}
352356

357+
#[track_caller]
353358
pub fn emit_warning<'a>(&'a self, warning: impl IntoDiagnostic<'a, ()>) {
354359
self.create_warning(warning).emit()
355360
}
@@ -377,6 +382,7 @@ impl ParseSess {
377382
}
378383

379384
#[rustc_lint_diagnostics]
385+
#[track_caller]
380386
pub fn struct_err(
381387
&self,
382388
msg: impl Into<DiagnosticMessage>,

‎compiler/rustc_session/src/session.rs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,7 @@ impl Session {
330330
self.diagnostic().struct_warn_with_expectation(msg, id)
331331
}
332332
#[rustc_lint_diagnostics]
333+
#[track_caller]
333334
pub fn struct_span_allow<S: Into<MultiSpan>>(
334335
&self,
335336
sp: S,
@@ -338,10 +339,12 @@ impl Session {
338339
self.diagnostic().struct_span_allow(sp, msg)
339340
}
340341
#[rustc_lint_diagnostics]
342+
#[track_caller]
341343
pub fn struct_allow(&self, msg: impl Into<DiagnosticMessage>) -> DiagnosticBuilder<'_, ()> {
342344
self.diagnostic().struct_allow(msg)
343345
}
344346
#[rustc_lint_diagnostics]
347+
#[track_caller]
345348
pub fn struct_expect(
346349
&self,
347350
msg: impl Into<DiagnosticMessage>,
@@ -396,6 +399,7 @@ impl Session {
396399
self.diagnostic().struct_warn_with_code(msg, code)
397400
}
398401
#[rustc_lint_diagnostics]
402+
#[track_caller]
399403
pub fn struct_span_fatal<S: Into<MultiSpan>>(
400404
&self,
401405
sp: S,
@@ -418,6 +422,7 @@ impl Session {
418422
}
419423

420424
#[rustc_lint_diagnostics]
425+
#[track_caller]
421426
pub fn span_fatal<S: Into<MultiSpan>>(&self, sp: S, msg: impl Into<DiagnosticMessage>) -> ! {
422427
self.diagnostic().span_fatal(sp, msg)
423428
}
@@ -490,33 +495,40 @@ impl Session {
490495
add_feature_diagnostics(&mut err, &self.parse_sess, feature);
491496
err
492497
}
498+
#[track_caller]
493499
pub fn emit_err<'a>(&'a self, err: impl IntoDiagnostic<'a>) -> ErrorGuaranteed {
494500
self.parse_sess.emit_err(err)
495501
}
502+
#[track_caller]
496503
pub fn create_warning<'a>(
497504
&'a self,
498505
err: impl IntoDiagnostic<'a, ()>,
499506
) -> DiagnosticBuilder<'a, ()> {
500507
self.parse_sess.create_warning(err)
501508
}
509+
#[track_caller]
502510
pub fn emit_warning<'a>(&'a self, warning: impl IntoDiagnostic<'a, ()>) {
503511
self.parse_sess.emit_warning(warning)
504512
}
513+
#[track_caller]
505514
pub fn create_note<'a>(
506515
&'a self,
507516
note: impl IntoDiagnostic<'a, Noted>,
508517
) -> DiagnosticBuilder<'a, Noted> {
509518
self.parse_sess.create_note(note)
510519
}
520+
#[track_caller]
511521
pub fn emit_note<'a>(&'a self, note: impl IntoDiagnostic<'a, Noted>) -> Noted {
512522
self.parse_sess.emit_note(note)
513523
}
524+
#[track_caller]
514525
pub fn create_fatal<'a>(
515526
&'a self,
516527
fatal: impl IntoDiagnostic<'a, !>,
517528
) -> DiagnosticBuilder<'a, !> {
518529
self.parse_sess.create_fatal(fatal)
519530
}
531+
#[track_caller]
520532
pub fn emit_fatal<'a>(&'a self, fatal: impl IntoDiagnostic<'a, !>) -> ! {
521533
self.parse_sess.emit_fatal(fatal)
522534
}
@@ -556,6 +568,7 @@ impl Session {
556568
}
557569
#[allow(rustc::untranslatable_diagnostic)]
558570
#[allow(rustc::diagnostic_outside_of_impl)]
571+
#[track_caller]
559572
pub fn span_warn<S: Into<MultiSpan>>(&self, sp: S, msg: impl Into<DiagnosticMessage>) {
560573
self.diagnostic().span_warn(sp, msg)
561574
}
@@ -602,6 +615,8 @@ impl Session {
602615
pub fn note_without_error(&self, msg: impl Into<DiagnosticMessage>) {
603616
self.diagnostic().note_without_error(msg)
604617
}
618+
619+
#[track_caller]
605620
pub fn span_note_without_error<S: Into<MultiSpan>>(
606621
&self,
607622
sp: S,

‎compiler/rustc_trait_selection/src/errors.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ pub struct NegativePositiveConflict<'a> {
6767
}
6868

6969
impl IntoDiagnostic<'_> for NegativePositiveConflict<'_> {
70+
#[track_caller]
7071
fn into_diagnostic(
7172
self,
7273
handler: &Handler,

‎src/test/ui/track-diagnostics/track.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ error[E0268]: `break` outside of a loop
1010
|
1111
LL | break rust
1212
| ^^^^^^^^^^ cannot `break` outside of a loop
13-
-Ztrack-diagnostics: created at compiler/rustc_passes/src/errors.rs:LL:CC
13+
-Ztrack-diagnostics: created at compiler/rustc_passes/src/loops.rs:LL:CC
1414

1515
error: internal compiler error: It looks like you're trying to break rust; would you like some ICE?
1616

‎src/test/ui/track-diagnostics/track6.rs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// compile-flags: -Z track-diagnostics
2+
// error-pattern: created at
3+
4+
5+
6+
pub trait Foo {
7+
fn bar();
8+
}
9+
10+
impl <T> Foo for T {
11+
default fn bar() {}
12+
}
13+
14+
fn main() {}

‎src/test/ui/track-diagnostics/track6.stderr

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
error[E0658]: specialization is unstable
2+
--> $DIR/track6.rs:11:5
3+
|
4+
LL | default fn bar() {}
5+
| ^^^^^^^^^^^^^^^^^^^
6+
-Ztrack-diagnostics: created at $COMPILER_DIR/rustc_session/src/parse.rs:93:5
7+
|
8+
= note: see issue #31844 <https://github.com/rust-lang/rust/issues/31844> for more information
9+
= help: add `#![feature(specialization)]` to the crate attributes to enable
10+
11+
error: aborting due to previous error
12+
13+
For more information about this error, try `rustc --explain E0658`.

0 commit comments

Comments
 (0)