diff options
| author | The Miri Cronjob Bot <miri@cron.bot> | 2025-08-09 05:04:41 +0000 |
|---|---|---|
| committer | The Miri Cronjob Bot <miri@cron.bot> | 2025-08-09 05:04:41 +0000 |
| commit | 89ed3789539295070a20e6959e66ba69ce08e4cf (patch) | |
| tree | d515f9dfffc22d28077ed548bac7ec82f0031555 /compiler/rustc_errors | |
| parent | d7a4303db25ce79633425a686b694a9e0b935a38 (diff) | |
| parent | 2736d66a1f76e4829d95145a60b13bf695d5ef44 (diff) | |
| download | rust-89ed3789539295070a20e6959e66ba69ce08e4cf.tar.gz rust-89ed3789539295070a20e6959e66ba69ce08e4cf.zip | |
Merge ref '4c7749e8c8e5' from rust-lang/rust
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: 4c7749e8c8e50ad146da599eea3a250160c1bc2b Filtered ref: 9742b5940dcb4aea810f9ce020a92b3f72ed7bb4 This merge was created using https://github.com/rust-lang/josh-sync.
Diffstat (limited to 'compiler/rustc_errors')
| -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() |