diff options
| author | bors <bors@rust-lang.org> | 2025-05-04 06:23:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-05-04 06:23:38 +0000 |
| commit | 622ac043764d5d4ffff8de8cf86a1cc938a8a71b (patch) | |
| tree | 3120789b5b2fda7c455b7f0805ea00e399618d25 /compiler/rustc_passes | |
| parent | 1bea580f364c65bd5f7380a1056e150df7b8a1a6 (diff) | |
| parent | 1239f499e871401742b717a8e26fb7e5712d957e (diff) | |
| download | rust-622ac043764d5d4ffff8de8cf86a1cc938a8a71b.tar.gz rust-622ac043764d5d4ffff8de8cf86a1cc938a8a71b.zip | |
Auto merge of #140633 - Zalathar:rollup-iay94wa, r=Zalathar
Rollup of 7 pull requests Successful merges: - #139675 (Add the AVX10 target features) - #140286 (Check if format argument is identifier to avoid error err-emit) - #140456 (Fix test simd/extract-insert-dyn on s390x) - #140551 (Move some tests out of tests/ui) - #140588 (Adjust some ui tests re. target-dependent errors) - #140617 (Report the `unsafe_attr_outside_unsafe` lint at the closest node) - #140626 (allow `#[rustfmt::skip]` in combination with `#[naked]`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_passes')
| -rw-r--r-- | compiler/rustc_passes/src/check_attr.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler/rustc_passes/src/check_attr.rs b/compiler/rustc_passes/src/check_attr.rs index f04b167889f..e5b20901c0c 100644 --- a/compiler/rustc_passes/src/check_attr.rs +++ b/compiler/rustc_passes/src/check_attr.rs @@ -683,7 +683,9 @@ impl<'tcx> CheckAttrVisitor<'tcx> { } } - if !other_attr.has_any_name(ALLOW_LIST) { + if !other_attr.has_any_name(ALLOW_LIST) + && !matches!(other_attr.path().as_slice(), [sym::rustfmt, ..]) + { let path = other_attr.path(); let path: Vec<_> = path.iter().map(|s| s.as_str()).collect(); let other_attr_name = path.join("::"); |