diff --git a/compiler/rustc_ast/src/ast.rs b/compiler/rustc_ast/src/ast.rs
index 71932f02017..30c54ef2d3c 100644
--- a/compiler/rustc_ast/src/ast.rs
+++ b/compiler/rustc_ast/src/ast.rs
@@ -3184,38 +3184,6 @@ pub struct StaticItem {
pub expr: Option
>,
}
-/// A static item in `extern` block.
-// This struct is identical to StaticItem for now but it's going to have a safety attribute.
-#[derive(Clone, Encodable, Decodable, Debug)]
-pub struct StaticForeignItem {
- pub ty: P,
- pub safety: Safety,
- pub mutability: Mutability,
- pub expr: Option>,
-}
-
-impl From for StaticForeignItem {
- fn from(static_item: StaticItem) -> StaticForeignItem {
- StaticForeignItem {
- ty: static_item.ty,
- safety: static_item.safety,
- mutability: static_item.mutability,
- expr: static_item.expr,
- }
- }
-}
-
-impl From for StaticItem {
- fn from(static_item: StaticForeignItem) -> StaticItem {
- StaticItem {
- ty: static_item.ty,
- safety: static_item.safety,
- mutability: static_item.mutability,
- expr: static_item.expr,
- }
- }
-}
-
#[derive(Clone, Encodable, Decodable, Debug)]
pub struct ConstItem {
pub defaultness: Defaultness,
@@ -3430,7 +3398,7 @@ fn try_from(item_kind: ItemKind) -> Result {
#[derive(Clone, Encodable, Decodable, Debug)]
pub enum ForeignItemKind {
/// A foreign static item (`static FOO: u8`).
- Static(Box),
+ Static(Box),
/// An foreign function.
Fn(Box),
/// An foreign type.
diff --git a/compiler/rustc_ast/src/mut_visit.rs b/compiler/rustc_ast/src/mut_visit.rs
index 35aa53e978c..c9d2f5c779b 100644
--- a/compiler/rustc_ast/src/mut_visit.rs
+++ b/compiler/rustc_ast/src/mut_visit.rs
@@ -1310,12 +1310,7 @@ pub fn noop_flat_map_item(
impl NoopVisitItemKind for ForeignItemKind {
fn noop_visit(&mut self, visitor: &mut impl MutVisitor) {
match self {
- ForeignItemKind::Static(box StaticForeignItem {
- ty,
- mutability: _,
- expr,
- safety: _,
- }) => {
+ ForeignItemKind::Static(box StaticItem { ty, mutability: _, expr, safety: _ }) => {
visitor.visit_ty(ty);
visit_opt(expr, |expr| visitor.visit_expr(expr));
}
diff --git a/compiler/rustc_ast/src/visit.rs b/compiler/rustc_ast/src/visit.rs
index ed34a44db67..ce38a67ea69 100644
--- a/compiler/rustc_ast/src/visit.rs
+++ b/compiler/rustc_ast/src/visit.rs
@@ -672,12 +672,7 @@ fn walk<'a, V: Visitor<'a>>(
) -> V::Result {
let &Item { id, span, ident, ref vis, .. } = item;
match self {
- ForeignItemKind::Static(box StaticForeignItem {
- ty,
- mutability: _,
- expr,
- safety: _,
- }) => {
+ ForeignItemKind::Static(box StaticItem { ty, mutability: _, expr, safety: _ }) => {
try_visit!(visitor.visit_ty(ty));
visit_opt!(visitor, visit_expr, expr);
}
diff --git a/compiler/rustc_ast_lowering/src/item.rs b/compiler/rustc_ast_lowering/src/item.rs
index c6c0d9a2e60..4c7e8c24d32 100644
--- a/compiler/rustc_ast_lowering/src/item.rs
+++ b/compiler/rustc_ast_lowering/src/item.rs
@@ -664,12 +664,7 @@ fn lower_foreign_item(&mut self, i: &ForeignItem) -> &'hir hir::ForeignItem<'hir
hir::ForeignItemKind::Fn(fn_dec, fn_args, generics, safety)
}
- ForeignItemKind::Static(box StaticForeignItem {
- ty,
- mutability,
- expr: _,
- safety,
- }) => {
+ ForeignItemKind::Static(box StaticItem { ty, mutability, expr: _, safety }) => {
let ty = self
.lower_ty(ty, ImplTraitContext::Disallowed(ImplTraitPosition::StaticTy));
let safety = self.lower_safety(*safety, hir::Safety::Unsafe);
diff --git a/compiler/rustc_ast_passes/src/ast_validation.rs b/compiler/rustc_ast_passes/src/ast_validation.rs
index b274a9b9114..cad1fc79d7f 100644
--- a/compiler/rustc_ast_passes/src/ast_validation.rs
+++ b/compiler/rustc_ast_passes/src/ast_validation.rs
@@ -1232,7 +1232,7 @@ fn visit_foreign_item(&mut self, fi: &'a ForeignItem) {
self.check_foreign_ty_genericless(generics, where_clauses);
self.check_foreign_item_ascii_only(fi.ident);
}
- ForeignItemKind::Static(box StaticForeignItem { expr, safety, .. }) => {
+ ForeignItemKind::Static(box StaticItem { expr, safety, .. }) => {
self.check_foreign_item_safety(fi.span, *safety);
self.check_foreign_kind_bodyless(fi.ident, "static", expr.as_ref().map(|b| b.span));
self.check_foreign_item_ascii_only(fi.ident);
diff --git a/compiler/rustc_ast_pretty/src/pprust/state/item.rs b/compiler/rustc_ast_pretty/src/pprust/state/item.rs
index 49ac5ece337..d8382057d3f 100644
--- a/compiler/rustc_ast_pretty/src/pprust/state/item.rs
+++ b/compiler/rustc_ast_pretty/src/pprust/state/item.rs
@@ -37,12 +37,7 @@ fn print_foreign_item(&mut self, item: &ast::ForeignItem) {
ast::ForeignItemKind::Fn(box ast::Fn { defaultness, sig, generics, body }) => {
self.print_fn_full(sig, ident, generics, vis, *defaultness, body.as_deref(), attrs);
}
- ast::ForeignItemKind::Static(box ast::StaticForeignItem {
- ty,
- mutability,
- expr,
- safety,
- }) => {
+ ast::ForeignItemKind::Static(box ast::StaticItem { ty, mutability, expr, safety }) => {
self.print_safety(*safety);
self.print_item_const(
ident,
diff --git a/compiler/rustc_parse/src/parser/item.rs b/compiler/rustc_parse/src/parser/item.rs
index 3e1ea7b129d..abb6b51cebd 100644
--- a/compiler/rustc_parse/src/parser/item.rs
+++ b/compiler/rustc_parse/src/parser/item.rs
@@ -1228,7 +1228,7 @@ pub fn parse_foreign_item(
ident_span: ident.span,
const_span,
});
- ForeignItemKind::Static(Box::new(StaticForeignItem {
+ ForeignItemKind::Static(Box::new(StaticItem {
ty,
mutability: Mutability::Not,
expr,
diff --git a/compiler/rustc_resolve/src/def_collector.rs b/compiler/rustc_resolve/src/def_collector.rs
index 60789c08313..1bca5602a4e 100644
--- a/compiler/rustc_resolve/src/def_collector.rs
+++ b/compiler/rustc_resolve/src/def_collector.rs
@@ -217,12 +217,7 @@ fn visit_use_tree(&mut self, use_tree: &'a UseTree, id: NodeId, _nested: bool) {
fn visit_foreign_item(&mut self, fi: &'a ForeignItem) {
let def_kind = match fi.kind {
- ForeignItemKind::Static(box StaticForeignItem {
- ty: _,
- mutability,
- expr: _,
- safety,
- }) => {
+ ForeignItemKind::Static(box StaticItem { ty: _, mutability, expr: _, safety }) => {
let safety = match safety {
ast::Safety::Unsafe(_) | ast::Safety::Default => hir::Safety::Unsafe,
ast::Safety::Safe(_) => hir::Safety::Safe,
diff --git a/src/tools/clippy/clippy_utils/src/ast_utils.rs b/src/tools/clippy/clippy_utils/src/ast_utils.rs
index fb43f7d80af..785d5ed5dbe 100644
--- a/src/tools/clippy/clippy_utils/src/ast_utils.rs
+++ b/src/tools/clippy/clippy_utils/src/ast_utils.rs
@@ -449,13 +449,13 @@ pub fn eq_foreign_item_kind(l: &ForeignItemKind, r: &ForeignItemKind) -> bool {
use ForeignItemKind::*;
match (l, r) {
(
- Static(box StaticForeignItem {
+ Static(box StaticItem {
ty: lt,
mutability: lm,
expr: le,
safety: ls,
}),
- Static(box StaticForeignItem {
+ Static(box StaticItem {
ty: rt,
mutability: rm,
expr: re,