Skip to content

Commit 622d037

Browse files
spastorinospastorino
committed
Add StaticForeignItem and use it on ForeignItemKind
1 parent 3824cb3 commit 622d037

File tree

10 files changed

+76
-30
lines changed

10 files changed

+76
-30
lines changed

‎compiler/rustc_ast/src/ast.rs‎

Lines changed: 36 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3137,6 +3137,35 @@ pub struct StaticItem {
31373137
pub expr: Option<P<Expr>>,
31383138
}
31393139

3140+
/// A static item in `extern` block.
3141+
// This struct is identical to StaticItem for now but it's going to have a safety attribute.
3142+
#[derive(Clone, Encodable, Decodable, Debug)]
3143+
pub struct StaticForeignItem {
3144+
pub ty: P<Ty>,
3145+
pub mutability: Mutability,
3146+
pub expr: Option<P<Expr>>,
3147+
}
3148+
3149+
impl From<StaticItem> for StaticForeignItem {
3150+
fn from(static_item: StaticItem) -> StaticForeignItem {
3151+
StaticForeignItem {
3152+
ty: static_item.ty,
3153+
mutability: static_item.mutability,
3154+
expr: static_item.expr,
3155+
}
3156+
}
3157+
}
3158+
3159+
impl From<StaticForeignItem> for StaticItem {
3160+
fn from(static_item: StaticForeignItem) -> StaticItem {
3161+
StaticItem {
3162+
ty: static_item.ty,
3163+
mutability: static_item.mutability,
3164+
expr: static_item.expr,
3165+
}
3166+
}
3167+
}
3168+
31403169
#[derive(Clone, Encodable, Decodable, Debug)]
31413170
pub struct ConstItem {
31423171
pub defaultness: Defaultness,
@@ -3340,7 +3369,7 @@ impl TryFrom<ItemKind> for AssocItemKind {
33403369
#[derive(Clone, Encodable, Decodable, Debug)]
33413370
pub enum ForeignItemKind {
33423371
/// A foreign static item (`static FOO: u8`).
3343-
Static(P<Ty>, Mutability, Option<P<Expr>>),
3372+
Static(Box<StaticForeignItem>),
33443373
/// An foreign function.
33453374
Fn(Box<Fn>),
33463375
/// An foreign type.
@@ -3352,8 +3381,8 @@ pub enum ForeignItemKind {
33523381
impl From<ForeignItemKind> for ItemKind {
33533382
fn from(foreign_item_kind: ForeignItemKind) -> ItemKind {
33543383
match foreign_item_kind {
3355-
ForeignItemKind::Static(a, b, c) => {
3356-
ItemKind::Static(StaticItem { ty: a, mutability: b, expr: c }.into())
3384+
ForeignItemKind::Static(box static_foreign_item) => {
3385+
ItemKind::Static(Box::new(static_foreign_item.into()))
33573386
}
33583387
ForeignItemKind::Fn(fn_kind) => ItemKind::Fn(fn_kind),
33593388
ForeignItemKind::TyAlias(ty_alias_kind) => ItemKind::TyAlias(ty_alias_kind),
@@ -3367,8 +3396,8 @@ impl TryFrom<ItemKind> for ForeignItemKind {
33673396

33683397
fn try_from(item_kind: ItemKind) -> Result<ForeignItemKind, ItemKind> {
33693398
Ok(match item_kind {
3370-
ItemKind::Static(box StaticItem { ty: a, mutability: b, expr: c }) => {
3371-
ForeignItemKind::Static(a, b, c)
3399+
ItemKind::Static(box static_item) => {
3400+
ForeignItemKind::Static(Box::new(static_item.into()))
33723401
}
33733402
ItemKind::Fn(fn_kind) => ForeignItemKind::Fn(fn_kind),
33743403
ItemKind::TyAlias(ty_alias_kind) => ForeignItemKind::TyAlias(ty_alias_kind),
@@ -3393,8 +3422,8 @@ mod size_asserts {
33933422
static_assert_size!(Expr, 72);
33943423
static_assert_size!(ExprKind, 40);
33953424
static_assert_size!(Fn, 160);
3396-
static_assert_size!(ForeignItem, 96);
3397-
static_assert_size!(ForeignItemKind, 24);
3425+
static_assert_size!(ForeignItem, 88);
3426+
static_assert_size!(ForeignItemKind, 16);
33983427
static_assert_size!(GenericArg, 24);
33993428
static_assert_size!(GenericBound, 88);
34003429
static_assert_size!(Generics, 40);

‎compiler/rustc_ast/src/mut_visit.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1268,7 +1268,7 @@ pub fn noop_flat_map_item<K: NoopVisitItemKind>(
12681268
impl NoopVisitItemKind for ForeignItemKind {
12691269
fn noop_visit(&mut self, visitor: &mut impl MutVisitor) {
12701270
match self {
1271-
ForeignItemKind::Static(ty, _, expr) => {
1271+
ForeignItemKind::Static(box StaticForeignItem { ty, mutability: _, expr }) => {
12721272
visitor.visit_ty(ty);
12731273
visit_opt(expr, |expr| visitor.visit_expr(expr));
12741274
}

‎compiler/rustc_ast/src/visit.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,7 @@ impl WalkItemKind for ForeignItemKind {
642642
) -> V::Result {
643643
let &Item { id, span, ident, ref vis, .. } = item;
644644
match self {
645-
ForeignItemKind::Static(ty, _, expr) => {
645+
ForeignItemKind::Static(box StaticForeignItem { ty, mutability: _, expr }) => {
646646
try_visit!(visitor.visit_ty(ty));
647647
visit_opt!(visitor, visit_expr, expr);
648648
}

‎compiler/rustc_ast_lowering/src/item.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -662,10 +662,10 @@ impl<'hir> LoweringContext<'_, 'hir> {
662662

663663
hir::ForeignItemKind::Fn(fn_dec, fn_args, generics)
664664
}
665-
ForeignItemKind::Static(t, m, _) => {
666-
let ty =
667-
self.lower_ty(t, ImplTraitContext::Disallowed(ImplTraitPosition::StaticTy));
668-
hir::ForeignItemKind::Static(ty, *m)
665+
ForeignItemKind::Static(box StaticForeignItem { ty, mutability, expr: _ }) => {
666+
let ty = self
667+
.lower_ty(ty, ImplTraitContext::Disallowed(ImplTraitPosition::StaticTy));
668+
hir::ForeignItemKind::Static(ty, *mutability)
669669
}
670670
ForeignItemKind::TyAlias(..) => hir::ForeignItemKind::Type,
671671
ForeignItemKind::MacCall(_) => panic!("macro shouldn't exist here"),

‎compiler/rustc_ast_passes/src/ast_validation.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1185,8 +1185,8 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
11851185
self.check_foreign_ty_genericless(generics, where_clauses);
11861186
self.check_foreign_item_ascii_only(fi.ident);
11871187
}
1188-
ForeignItemKind::Static(_, _, body) => {
1189-
self.check_foreign_kind_bodyless(fi.ident, "static", body.as_ref().map(|b| b.span));
1188+
ForeignItemKind::Static(box StaticForeignItem { ty: _, mutability: _, expr }) => {
1189+
self.check_foreign_kind_bodyless(fi.ident, "static", expr.as_ref().map(|b| b.span));
11901190
self.check_foreign_item_ascii_only(fi.ident);
11911191
}
11921192
ForeignItemKind::MacCall(..) => {}

‎compiler/rustc_ast_pretty/src/pprust/state/item.rs‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,17 @@ impl<'a> State<'a> {
3030
ast::ForeignItemKind::Fn(box ast::Fn { defaultness, sig, generics, body }) => {
3131
self.print_fn_full(sig, ident, generics, vis, *defaultness, body.as_deref(), attrs);
3232
}
33-
ast::ForeignItemKind::Static(ty, mutbl, body) => self.print_item_const(
34-
ident,
35-
Some(*mutbl),
36-
&ast::Generics::default(),
37-
ty,
38-
body.as_deref(),
39-
vis,
40-
ast::Defaultness::Final,
41-
),
33+
ast::ForeignItemKind::Static(box ast::StaticForeignItem { ty, mutability, expr }) => {
34+
self.print_item_const(
35+
ident,
36+
Some(*mutability),
37+
&ast::Generics::default(),
38+
ty,
39+
expr.as_deref(),
40+
vis,
41+
ast::Defaultness::Final,
42+
)
43+
}
4244
ast::ForeignItemKind::TyAlias(box ast::TyAlias {
4345
defaultness,
4446
generics,

‎compiler/rustc_parse/src/parser/item.rs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1191,7 +1191,11 @@ impl<'a> Parser<'a> {
11911191
ident_span: ident.span,
11921192
const_span,
11931193
});
1194-
ForeignItemKind::Static(ty, Mutability::Not, expr)
1194+
ForeignItemKind::Static(Box::new(StaticForeignItem {
1195+
ty,
1196+
mutability: Mutability::Not,
1197+
expr,
1198+
}))
11951199
}
11961200
_ => return self.error_bad_item_kind(span, &kind, "`extern` blocks"),
11971201
},

‎compiler/rustc_resolve/src/def_collector.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ impl<'a, 'b, 'tcx> visit::Visitor<'a> for DefCollector<'a, 'b, 'tcx> {
209209

210210
fn visit_foreign_item(&mut self, fi: &'a ForeignItem) {
211211
let def_kind = match fi.kind {
212-
ForeignItemKind::Static(_, mutability, _) => {
212+
ForeignItemKind::Static(box StaticForeignItem { ty: _, mutability, expr: _ }) => {
213213
DefKind::Static { mutability, nested: false }
214214
}
215215
ForeignItemKind::Fn(_) => DefKind::Fn,

‎src/tools/clippy/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,

‎src/tools/rustfmt/src/items.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3325,11 +3325,11 @@ impl Rewrite for ast::ForeignItem {
33253325
.map(|(s, _, _)| format!("{};", s))
33263326
}
33273327
}
3328-
ast::ForeignItemKind::Static(ref ty, mutability, _) => {
3328+
ast::ForeignItemKind::Static(ref static_foreign_item) => {
33293329
// FIXME(#21): we're dropping potential comments in between the
33303330
// function kw here.
33313331
let vis = format_visibility(context, &self.vis);
3332-
let mut_str = format_mutability(mutability);
3332+
let mut_str = format_mutability(static_foreign_item.mutability);
33333333
let prefix = format!(
33343334
"{}static {}{}:",
33353335
vis,
@@ -3340,7 +3340,7 @@ impl Rewrite for ast::ForeignItem {
33403340
rewrite_assign_rhs(
33413341
context,
33423342
prefix,
3343-
&**ty,
3343+
&static_foreign_item.ty,
33443344
&RhsAssignKind::Ty,
33453345
shape.sub_width(1)?,
33463346
)

0 commit comments

Comments
 (0)