Skip to content

Commit f9df594

Browse files
committed
Auto merge of #126781 - matthiaskrgr:rollup-5u4pens, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #126125 (Improve conflict marker recovery) - #126481 (Add `powerpc-unknown-openbsd` maintenance status) - #126613 (Print the tested value in int_log tests) - #126617 (Expand `avx512_target_feature` to include VEX variants) - #126700 (Make edition dependent `:expr` macro fragment act like the edition-dependent `:pat` fragment does) - #126707 (Pass target to inaccessible-temp-dir rmake test) - #126767 (`StaticForeignItem` and `StaticItem` are the same) - #126774 (Fix another assertion failure for some Expect diagnostics.) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 0c3643b + 878b25d commit f9df594

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

clippy_utils/src/ast_utils.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -449,13 +449,13 @@ pub fn eq_foreign_item_kind(l: &ForeignItemKind, r: &ForeignItemKind) -> bool {
449449
use ForeignItemKind::*;
450450
match (l, r) {
451451
(
452-
Static(box StaticForeignItem {
452+
Static(box StaticItem {
453453
ty: lt,
454454
mutability: lm,
455455
expr: le,
456456
safety: ls,
457457
}),
458-
Static(box StaticForeignItem {
458+
Static(box StaticItem {
459459
ty: rt,
460460
mutability: rm,
461461
expr: re,

0 commit comments

Comments
 (0)