diff options
| author | bors <bors@rust-lang.org> | 2024-11-12 08:15:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-11-12 08:15:38 +0000 |
| commit | 5700240affd222f69b8755e2ff5d4ccaae9e6cf9 (patch) | |
| tree | 3044b18fc96fc4dc99ac844880ad911b5ec96d09 /compiler/rustc_builtin_macros/src/deriving/generic/mod.rs | |
| parent | 9a9daddd0dacfe8c5e8eaa07cfd054a3631bcde7 (diff) | |
| parent | 38c2db40206b0ec7d25ca31f985327ece9bfa497 (diff) | |
| download | rust-5700240affd222f69b8755e2ff5d4ccaae9e6cf9.tar.gz rust-5700240affd222f69b8755e2ff5d4ccaae9e6cf9.zip | |
Auto merge of #132943 - matthiaskrgr:rollup-164l3ej, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #132651 (Remove attributes from generics in built-in derive macros) - #132668 (Feature gate yield expressions not in 2024) - #132771 (test(configure): cover `parse_args` in `src/bootstrap/configure.py`) - #132895 (Generalize `NonNull::from_raw_parts` per ACP362) - #132914 (Update grammar in std::cell docs.) - #132927 (Consolidate type system const evaluation under `traits::evaluate_const`) - #132935 (Make sure to ignore elided lifetimes when pointing at args for fulfillment errors) - #132941 (Subtree update of `rust-analyzer`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_builtin_macros/src/deriving/generic/mod.rs')
| -rw-r--r-- | compiler/rustc_builtin_macros/src/deriving/generic/mod.rs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/compiler/rustc_builtin_macros/src/deriving/generic/mod.rs b/compiler/rustc_builtin_macros/src/deriving/generic/mod.rs index 82baaca9a46..79c198ed2d0 100644 --- a/compiler/rustc_builtin_macros/src/deriving/generic/mod.rs +++ b/compiler/rustc_builtin_macros/src/deriving/generic/mod.rs @@ -680,6 +680,12 @@ impl<'a> TraitDef<'a> { param_clone } }) + .map(|mut param| { + // Remove all attributes, because there might be helper attributes + // from other macros that will not be valid in the expanded implementation. + param.attrs.clear(); + param + }) .collect(); // and similarly for where clauses |
