diff options
| author | bors <bors@rust-lang.org> | 2025-04-18 13:49:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-04-18 13:49:17 +0000 |
| commit | 191df20fcad9331d3a948aa8e8556775ec3fe69d (patch) | |
| tree | f74fb63b5aa5487852469be80310c79a9ff95f2f /compiler/rustc_builtin_macros/src | |
| parent | 6a0bd27619a997ba7f040a28a41c3511423a3117 (diff) | |
| parent | 8cb57ed74bcd58b0499e5f9dd5e39cbef804d83f (diff) | |
| download | rust-191df20fcad9331d3a948aa8e8556775ec3fe69d.tar.gz rust-191df20fcad9331d3a948aa8e8556775ec3fe69d.zip | |
Auto merge of #139996 - matthiaskrgr:rollup-0nka2hw, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #138528 (deref patterns: implement implicit deref patterns) - #139393 (rustdoc-json: Output target feature information) - #139553 (sync::mpsc: prevent double free on `Drop`) - #139615 (Remove `name_or_empty`) - #139853 (Disable combining LLD with external llvm-config) - #139913 (rustdoc/clean: Fix lowering of fn params (fixes correctness & HIR vs. middle parity regressions)) - #139942 (Ignore aix for tests/ui/erros/pic-linker.rs) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_builtin_macros/src')
| -rw-r--r-- | compiler/rustc_builtin_macros/src/deriving/generic/mod.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/compiler/rustc_builtin_macros/src/deriving/generic/mod.rs b/compiler/rustc_builtin_macros/src/deriving/generic/mod.rs index b9197be4442..d9aac54ee73 100644 --- a/compiler/rustc_builtin_macros/src/deriving/generic/mod.rs +++ b/compiler/rustc_builtin_macros/src/deriving/generic/mod.rs @@ -527,15 +527,14 @@ impl<'a> TraitDef<'a> { item.attrs .iter() .filter(|a| { - [ + a.has_any_name(&[ sym::allow, sym::warn, sym::deny, sym::forbid, sym::stable, sym::unstable, - ] - .contains(&a.name_or_empty()) + ]) }) .cloned(), ); |
