Skip to content

Commit 9aba1e9

Browse files
spastorinospastorino
committed
Add StaticForeignItem and use it on ForeignItemKind
1 parent 9084601 commit 9aba1e9

File tree

8 files changed

+61
-26
lines changed

8 files changed

+61
-26
lines changed

‎compiler/rustc_ast/src/ast.rs‎

Lines changed: 36 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3126,6 +3126,35 @@ pub struct StaticItem {
31263126
pub expr: Option<P<Expr>>,
31273127
}
31283128

3129+
/// A static item in `extern` block.
3130+
// This struct is identical to StaticItem for now but it's going to have a safety attribute.
3131+
#[derive(Clone, Encodable, Decodable, Debug)]
3132+
pub struct StaticForeignItem {
3133+
pub ty: P<Ty>,
3134+
pub mutability: Mutability,
3135+
pub expr: Option<P<Expr>>,
3136+
}
3137+
3138+
impl From<StaticItem> for StaticForeignItem {
3139+
fn from(static_item: StaticItem) -> StaticForeignItem {
3140+
StaticForeignItem {
3141+
ty: static_item.ty,
3142+
mutability: static_item.mutability,
3143+
expr: static_item.expr,
3144+
}
3145+
}
3146+
}
3147+
3148+
impl From<StaticForeignItem> for StaticItem {
3149+
fn from(static_item: StaticForeignItem) -> StaticItem {
3150+
StaticItem {
3151+
ty: static_item.ty,
3152+
mutability: static_item.mutability,
3153+
expr: static_item.expr,
3154+
}
3155+
}
3156+
}
3157+
31293158
#[derive(Clone, Encodable, Decodable, Debug)]
31303159
pub struct ConstItem {
31313160
pub defaultness: Defaultness,
@@ -3329,7 +3358,7 @@ impl TryFrom<ItemKind> for AssocItemKind {
33293358
#[derive(Clone, Encodable, Decodable, Debug)]
33303359
pub enum ForeignItemKind {
33313360
/// A foreign static item (`static FOO: u8`).
3332-
Static(P<Ty>, Mutability, Option<P<Expr>>),
3361+
Static(Box<StaticForeignItem>),
33333362
/// An foreign function.
33343363
Fn(Box<Fn>),
33353364
/// An foreign type.
@@ -3341,8 +3370,8 @@ pub enum ForeignItemKind {
33413370
impl From<ForeignItemKind> for ItemKind {
33423371
fn from(foreign_item_kind: ForeignItemKind) -> ItemKind {
33433372
match foreign_item_kind {
3344-
ForeignItemKind::Static(a, b, c) => {
3345-
ItemKind::Static(StaticItem { ty: a, mutability: b, expr: c }.into())
3373+
ForeignItemKind::Static(box static_foreign_item) => {
3374+
ItemKind::Static(Box::new(static_foreign_item.into()))
33463375
}
33473376
ForeignItemKind::Fn(fn_kind) => ItemKind::Fn(fn_kind),
33483377
ForeignItemKind::TyAlias(ty_alias_kind) => ItemKind::TyAlias(ty_alias_kind),
@@ -3356,8 +3385,8 @@ impl TryFrom<ItemKind> for ForeignItemKind {
33563385

33573386
fn try_from(item_kind: ItemKind) -> Result<ForeignItemKind, ItemKind> {
33583387
Ok(match item_kind {
3359-
ItemKind::Static(box StaticItem { ty: a, mutability: b, expr: c }) => {
3360-
ForeignItemKind::Static(a, b, c)
3388+
ItemKind::Static(box static_item) => {
3389+
ForeignItemKind::Static(Box::new(static_item.into()))
33613390
}
33623391
ItemKind::Fn(fn_kind) => ForeignItemKind::Fn(fn_kind),
33633392
ItemKind::TyAlias(ty_alias_kind) => ForeignItemKind::TyAlias(ty_alias_kind),
@@ -3382,8 +3411,8 @@ mod size_asserts {
33823411
static_assert_size!(Expr, 72);
33833412
static_assert_size!(ExprKind, 40);
33843413
static_assert_size!(Fn, 160);
3385-
static_assert_size!(ForeignItem, 96);
3386-
static_assert_size!(ForeignItemKind, 24);
3414+
static_assert_size!(ForeignItem, 88);
3415+
static_assert_size!(ForeignItemKind, 16);
33873416
static_assert_size!(GenericArg, 24);
33883417
static_assert_size!(GenericBound, 88);
33893418
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
@@ -1261,7 +1261,7 @@ pub fn noop_flat_map_item<K: NoopVisitItemKind>(
12611261
impl NoopVisitItemKind for ForeignItemKind {
12621262
fn noop_visit(&mut self, visitor: &mut impl MutVisitor) {
12631263
match self {
1264-
ForeignItemKind::Static(ty, _, expr) => {
1264+
ForeignItemKind::Static(box StaticForeignItem { ty, mutability: _, expr }) => {
12651265
visitor.visit_ty(ty);
12661266
visit_opt(expr, |expr| visitor.visit_expr(expr));
12671267
}

‎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,

0 commit comments

Comments
 (0)