Ugly fix

Author: JonathanBrouwer

compiler/rustc_errors/src/diagnostic.rs

@@ -140,15 +140,15 @@ where
 }
 
 #[derive(Clone, Debug, Encodable, Decodable)]
-pub(crate) struct DiagLocation {
+pub struct DiagLocation {
     file: Cow<'static, str>,
     line: u32,
     col: u32,
 }
 
 impl DiagLocation {
     #[track_caller]
-    fn caller() -> Self {
+    pub fn caller() -> Self {
         let loc = panic::Location::caller();
         DiagLocation { file: loc.file().into(), line: loc.line(), col: loc.column() }
     }
@@ -249,7 +249,7 @@ pub struct DiagInner {
     pub long_ty_path: Option<PathBuf>,
     /// With `-Ztrack_diagnostics` enabled,
     /// we print where in rustc this error was emitted.
-    pub(crate) emitted_at: DiagLocation,
+    pub emitted_at: DiagLocation,
 }
 
 impl DiagInner {

compiler/rustc_errors/src/lib.rs

@@ -37,8 +37,8 @@ pub use anstyle::{
 pub use codes::*;
 pub use decorate_diag::{BufferedEarlyLint, DecorateDiagCompat, LintBuffer};
 pub use diagnostic::{
-    BugAbort, Diag, DiagInner, DiagStyledString, Diagnostic, EmissionGuarantee, FatalAbort,
-    StringPart, Subdiag, Subdiagnostic,
+    BugAbort, Diag, DiagInner, DiagLocation, DiagStyledString, Diagnostic, EmissionGuarantee,
+    FatalAbort, StringPart, Subdiag, Subdiagnostic,
 };
 pub use diagnostic_impls::{
     DiagSymbolList, ElidedLifetimeInPathSubdiag, ExpectedLifetimeParameter,

compiler/rustc_middle/src/lint.rs

@@ -2,7 +2,7 @@ use std::cmp;
 
 use rustc_data_structures::fx::FxIndexMap;
 use rustc_data_structures::sorted_map::SortedMap;
-use rustc_errors::{Diag, Diagnostic, MultiSpan};
+use rustc_errors::{Diag, DiagLocation, Diagnostic, MultiSpan};
 use rustc_hir::{HirId, ItemLocalId};
 use rustc_lint_defs::EditionFcw;
 use rustc_macros::{Decodable, Encodable, HashStable};
@@ -502,6 +502,8 @@ pub fn diag_lint_level<'a, D: Diagnostic<'a, ()> + 'a>(
     span: Option<MultiSpan>,
     decorate: D,
 ) {
+    let caller = DiagLocation::caller();
+
     // Avoid codegen bloat from monomorphization by immediately doing dyn dispatch of `decorate` to
     // the "real" work.
     #[track_caller]
@@ -513,6 +515,7 @@ pub fn diag_lint_level<'a, D: Diagnostic<'a, ()> + 'a>(
         decorate: Box<
             dyn FnOnce(rustc_errors::DiagCtxtHandle<'a>, rustc_errors::Level) -> Diag<'a, ()> + 'a,
         >,
+        caller: DiagLocation,
     ) {
         let LevelAndSource { level, lint_id, src } = level;
 
@@ -602,6 +605,8 @@ pub fn diag_lint_level<'a, D: Diagnostic<'a, ()> + 'a>(
         } else {
             Diag::new(sess.dcx(), err_level, "")
         };
+        err.emitted_at = caller;
+
         if let Some(span) = span
             && err.span.primary_span().is_none()
         {
@@ -692,5 +697,6 @@ pub fn diag_lint_level<'a, D: Diagnostic<'a, ()> + 'a>(
         level,
         span,
         Box::new(move |dcx, level| decorate.into_diag(dcx, level)),
+        caller,
     );
 }