diff options
| author | Ben Kimock <kimockb@gmail.com> | 2025-08-10 01:45:38 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-10 01:45:38 +0000 |
| commit | 85c8d7089035d60c63a0594b07ff48981399f2ed (patch) | |
| tree | f126cf7695965577ab96b9c27e5a9c5c491f8dd2 /compiler/rustc_errors/src | |
| parent | ee1b237215ee90df2c0102457fa2d0e9c2df8753 (diff) | |
| parent | 6e83b592cddec5ab61f1e4307134fd8f4069351e (diff) | |
| download | rust-85c8d7089035d60c63a0594b07ff48981399f2ed.tar.gz rust-85c8d7089035d60c63a0594b07ff48981399f2ed.zip | |
Merge pull request #4518 from rust-lang/rustup-2025-08-09
Automatic Rustup
Diffstat (limited to 'compiler/rustc_errors/src')
| -rw-r--r-- | compiler/rustc_errors/src/diagnostic.rs | 5 | ||||
| -rw-r--r-- | compiler/rustc_errors/src/emitter.rs | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/compiler/rustc_errors/src/diagnostic.rs b/compiler/rustc_errors/src/diagnostic.rs index 96c7ba6ed27..5a5563c7bb2 100644 --- a/compiler/rustc_errors/src/diagnostic.rs +++ b/compiler/rustc_errors/src/diagnostic.rs @@ -1382,6 +1382,11 @@ impl<'a, G: EmissionGuarantee> Diag<'a, G> { &mut self.long_ty_path } + pub fn with_long_ty_path(mut self, long_ty_path: Option<PathBuf>) -> Self { + self.long_ty_path = long_ty_path; + self + } + /// Most `emit_producing_guarantee` functions use this as a starting point. fn emit_producing_nothing(mut self) { let diag = self.take_diag(); diff --git a/compiler/rustc_errors/src/emitter.rs b/compiler/rustc_errors/src/emitter.rs index 84970e7c162..0c839f94f7f 100644 --- a/compiler/rustc_errors/src/emitter.rs +++ b/compiler/rustc_errors/src/emitter.rs @@ -409,7 +409,7 @@ pub trait Emitter { if !redundant_span || always_backtrace { let msg: Cow<'static, _> = match trace.kind { ExpnKind::Macro(MacroKind::Attr, _) => { - "this procedural macro expansion".into() + "this attribute macro expansion".into() } ExpnKind::Macro(MacroKind::Derive, _) => { "this derive macro expansion".into() |