diff options
| author | bors <bors@rust-lang.org> | 2024-06-06 08:14:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-06-06 08:14:58 +0000 |
| commit | ea13653f6f583f2d1fb196af05f5dc5995237f39 (patch) | |
| tree | 4faf73bbbbaa02dde108339be202ba66bd39ff0e | |
| parent | 38de6e1f3a48fc7a18448a3117f2db72c5fb356e (diff) | |
| parent | bd0f90824274d20bcace9d0149f1ffb0450e23cc (diff) | |
| download | rust-ea13653f6f583f2d1fb196af05f5dc5995237f39.tar.gz rust-ea13653f6f583f2d1fb196af05f5dc5995237f39.zip | |
Auto merge of #124482 - spastorino:unsafe-extern-blocks, r=oli-obk
Unsafe extern blocks This implements RFC 3484. Tracking issue #123743 and RFC https://github.com/rust-lang/rfcs/pull/3484 This is better reviewed commit by commit.
| -rw-r--r-- | clippy_utils/src/ast_utils.rs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/clippy_utils/src/ast_utils.rs b/clippy_utils/src/ast_utils.rs index bbdde3049db..c70f5c2df84 100644 --- a/clippy_utils/src/ast_utils.rs +++ b/clippy_utils/src/ast_utils.rs @@ -308,13 +308,15 @@ pub fn eq_item_kind(l: &ItemKind, r: &ItemKind) -> bool { ty: lt, mutability: lm, expr: le, + safety: ls, }), Static(box StaticItem { ty: rt, mutability: rm, expr: re, + safety: rs, }), - ) => lm == rm && eq_ty(lt, rt) && eq_expr_opt(le, re), + ) => lm == rm && ls == rs && eq_ty(lt, rt) && eq_expr_opt(le, re), ( Const(box ConstItem { defaultness: ld, @@ -451,13 +453,15 @@ pub fn eq_foreign_item_kind(l: &ForeignItemKind, r: &ForeignItemKind) -> bool { ty: lt, mutability: lm, expr: le, + safety: ls, }), Static(box StaticForeignItem { ty: rt, mutability: rm, expr: re, + safety: rs, }), - ) => lm == rm && eq_ty(lt, rt) && eq_expr_opt(le, re), + ) => lm == rm && eq_ty(lt, rt) && eq_expr_opt(le, re) && ls == rs, ( Fn(box ast::Fn { defaultness: ld, |