Skip to content

Commit 52e4e54

Browse files
committed
Auto merge of #124547 - matthiaskrgr:rollup-9tv8upg, r=matthiaskrgr
Rollup of 4 pull requests Successful merges: - #124519 (adapt a codegen test for llvm 19) - #124524 (Add StaticForeignItem and use it on ForeignItemKind) - #124540 (Give proof tree visitors the ability to instantiate nested goals directly) - #124543 (codegen tests: Tolerate `range()` qualifications in enum tests) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 8f1874c + be730f9 commit 52e4e54

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

clippy_utils/src/ast_utils.rs

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,18 @@ pub fn eq_item_kind(l: &ItemKind, r: &ItemKind) -> bool {
446446
pub fn eq_foreign_item_kind(l: &ForeignItemKind, r: &ForeignItemKind) -> bool {
447447
use ForeignItemKind::*;
448448
match (l, r) {
449-
(Static(lt, lm, le), Static(rt, rm, re)) => lm == rm && eq_ty(lt, rt) && eq_expr_opt(le, re),
449+
(
450+
Static(box StaticForeignItem {
451+
ty: lt,
452+
mutability: lm,
453+
expr: le,
454+
}),
455+
Static(box StaticForeignItem {
456+
ty: rt,
457+
mutability: rm,
458+
expr: re,
459+
}),
460+
) => lm == rm && eq_ty(lt, rt) && eq_expr_opt(le, re),
450461
(
451462
Fn(box ast::Fn {
452463
defaultness: ld,

0 commit comments

Comments
 (0)