about summary refs log tree commit diff
path: root/src/tools/clippy
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2024-04-30 06:43:42 +0200
committerGitHub <noreply@github.com>2024-04-30 06:43:42 +0200
commitea3d99eaa8f969f778be8f40f0a538430442b8d8 (patch)
tree833c8cc40182ae090dc26961af46bcdce48f2dee /src/tools/clippy
parentf4c9f29f276308cad88f221084a2e0cb1ffeefec (diff)
parentf06e0f783793ab5592b6799876d9329b1490bc30 (diff)
downloadrust-ea3d99eaa8f969f778be8f40f0a538430442b8d8.tar.gz
rust-ea3d99eaa8f969f778be8f40f0a538430442b8d8.zip
Rollup merge of #124524 - spastorino:make-foreign-static-use-struct, r=oli-obk
Add StaticForeignItem and use it on ForeignItemKind

This is in preparation for unsafe extern blocks that adds a safe variant for functions inside extern blocks.

r? `@oli-obk`
cc `@compiler-errors`
Diffstat (limited to 'src/tools/clippy')
-rw-r--r--src/tools/clippy/clippy_utils/src/ast_utils.rs13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/tools/clippy/clippy_utils/src/ast_utils.rs b/src/tools/clippy/clippy_utils/src/ast_utils.rs
index 0395eb1449b..529d20126b2 100644
--- a/src/tools/clippy/clippy_utils/src/ast_utils.rs
+++ b/src/tools/clippy/clippy_utils/src/ast_utils.rs
@@ -446,7 +446,18 @@ pub fn eq_item_kind(l: &ItemKind, r: &ItemKind) -> bool {
 pub fn eq_foreign_item_kind(l: &ForeignItemKind, r: &ForeignItemKind) -> bool {
     use ForeignItemKind::*;
     match (l, r) {
-        (Static(lt, lm, le), Static(rt, rm, re)) => lm == rm && eq_ty(lt, rt) && eq_expr_opt(le, re),
+        (
+            Static(box StaticForeignItem {
+                ty: lt,
+                mutability: lm,
+                expr: le,
+            }),
+            Static(box StaticForeignItem {
+                ty: rt,
+                mutability: rm,
+                expr: re,
+            }),
+        ) => lm == rm && eq_ty(lt, rt) && eq_expr_opt(le, re),
         (
             Fn(box ast::Fn {
                 defaultness: ld,