diff options
| author | bors <bors@rust-lang.org> | 2025-06-20 20:01:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-06-20 20:01:43 +0000 |
| commit | 5526a2f47cd676ceeedc08cf71ae75ce2e9284ae (patch) | |
| tree | 6523283d32a8e9bc33bbe861bd2cda6a6397f7b8 /compiler/rustc_expand/src/errors.rs | |
| parent | 9c4ff566babe632af5e30281a822d1ae9972873b (diff) | |
| parent | e7cc4ec8f78a43ed9d0c68731d9a1ef1ec688b0c (diff) | |
| download | rust-5526a2f47cd676ceeedc08cf71ae75ce2e9284ae.tar.gz rust-5526a2f47cd676ceeedc08cf71ae75ce2e9284ae.zip | |
Auto merge of #142795 - Kobzol:rollup-vvnnjno, r=Kobzol
Rollup of 10 pull requests Successful merges: - rust-lang/rust#142629 (Add config builder for bootstrap tests) - rust-lang/rust#142715 (correct template for `#[align]` attribute) - rust-lang/rust#142720 (De-dup common code from `ExternalCrate` methods) - rust-lang/rust#142736 (add issue template for rustdoc) - rust-lang/rust#142743 (rustc-dev-guide subtree update) - rust-lang/rust#142744 (Add a mailmap entry for y21) - rust-lang/rust#142758 (Make sure to rebuild rustdoc if `src/rustdoc-json-types` is changed) - rust-lang/rust#142764 (Convert `ilog(10)` to `ilog10()`) - rust-lang/rust#142767 (Some symbol and PathRoot cleanups) - rust-lang/rust#142769 (remove equivalent new method on context) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_expand/src/errors.rs')
| -rw-r--r-- | compiler/rustc_expand/src/errors.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_expand/src/errors.rs b/compiler/rustc_expand/src/errors.rs index ec0af67c046..714ba3bf0f4 100644 --- a/compiler/rustc_expand/src/errors.rs +++ b/compiler/rustc_expand/src/errors.rs @@ -183,12 +183,12 @@ pub(crate) struct FeatureNotAllowed { #[derive(Diagnostic)] #[diag(expand_recursion_limit_reached)] #[help] -pub(crate) struct RecursionLimitReached<'a> { +pub(crate) struct RecursionLimitReached { #[primary_span] pub span: Span, pub descr: String, pub suggested_limit: Limit, - pub crate_name: &'a str, + pub crate_name: Symbol, } #[derive(Diagnostic)] |
