Skip to content

Commit 62930d3

Browse files
CentrilCentril
committed
parse/ast: move Defaultness into variants.
1 parent 842027f commit 62930d3

33 files changed

+630
-359
lines changed

‎src/librustc_ast_lowering/item.rs

+24-24
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
173173
}
174174
ids
175175
}
176-
ItemKind::Const(ref ty, ..) => {
176+
ItemKind::Const(_, ref ty, ..) => {
177177
let mut ids = smallvec![i.id];
178178
if self.sess.features_untracked().impl_trait_in_bindings {
179179
let mut visitor = ImplTraitTypeIdVisitor { ids: &mut ids };
@@ -264,11 +264,11 @@ impl<'hir> LoweringContext<'_, 'hir> {
264264
let (ty, body_id) = self.lower_const_item(t, span, e.as_deref());
265265
hir::ItemKind::Static(ty, m, body_id)
266266
}
267-
ItemKind::Const(ref t, ref e) => {
267+
ItemKind::Const(_, ref t, ref e) => {
268268
let (ty, body_id) = self.lower_const_item(t, span, e.as_deref());
269269
hir::ItemKind::Const(ty, body_id)
270270
}
271-
ItemKind::Fn(FnSig { ref decl, header }, ref generics, ref body) => {
271+
ItemKind::Fn(_, FnSig { ref decl, header }, ref generics, ref body) => {
272272
let fn_def_id = self.resolver.definitions().local_def_id(id);
273273
self.with_new_scopes(|this| {
274274
this.current_item = Some(ident.span);
@@ -297,24 +297,24 @@ impl<'hir> LoweringContext<'_, 'hir> {
297297
ItemKind::Mod(ref m) => hir::ItemKind::Mod(self.lower_mod(m)),
298298
ItemKind::ForeignMod(ref nm) => hir::ItemKind::ForeignMod(self.lower_foreign_mod(nm)),
299299
ItemKind::GlobalAsm(ref ga) => hir::ItemKind::GlobalAsm(self.lower_global_asm(ga)),
300-
ItemKind::TyAlias(ref generics, _, Some(ref ty)) => match ty.kind.opaque_top_hack() {
300+
ItemKind::TyAlias(_, ref gen, _, Some(ref ty)) => match ty.kind.opaque_top_hack() {
301301
None => {
302302
let ty = self.lower_ty(ty, ImplTraitContext::disallowed());
303-
let generics = self.lower_generics(generics, ImplTraitContext::disallowed());
303+
let generics = self.lower_generics(gen, ImplTraitContext::disallowed());
304304
hir::ItemKind::TyAlias(ty, generics)
305305
}
306306
Some(bounds) => {
307307
let ctx = || ImplTraitContext::OpaqueTy(None, hir::OpaqueTyOrigin::Misc);
308308
let ty = hir::OpaqueTy {
309-
generics: self.lower_generics(generics, ctx()),
309+
generics: self.lower_generics(gen, ctx()),
310310
bounds: self.lower_param_bounds(bounds, ctx()),
311311
impl_trait_fn: None,
312312
origin: hir::OpaqueTyOrigin::TypeAlias,
313313
};
314314
hir::ItemKind::OpaqueTy(ty)
315315
}
316316
},
317-
ItemKind::TyAlias(ref generics, _, None) => {
317+
ItemKind::TyAlias(_, ref generics, _, None) => {
318318
let ty = self.arena.alloc(self.ty(span, hir::TyKind::Err));
319319
let generics = self.lower_generics(generics, ImplTraitContext::disallowed());
320320
hir::ItemKind::TyAlias(ty, generics)
@@ -654,7 +654,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
654654
ident: i.ident,
655655
attrs: self.lower_attrs(&i.attrs),
656656
kind: match i.kind {
657-
ForeignItemKind::Fn(ref sig, ref generics, _) => {
657+
ForeignItemKind::Fn(_, ref sig, ref generics, _) => {
658658
let fdec = &sig.decl;
659659
let (generics, (fn_dec, fn_args)) = self.add_in_band_defs(
660660
generics,
@@ -675,7 +675,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
675675
let ty = self.lower_ty(t, ImplTraitContext::disallowed());
676676
hir::ForeignItemKind::Static(ty, m)
677677
}
678-
ForeignItemKind::Const(ref t, _) => {
678+
ForeignItemKind::Const(_, ref t, _) => {
679679
// For recovery purposes.
680680
let ty = self.lower_ty(t, ImplTraitContext::disallowed());
681681
hir::ForeignItemKind::Static(ty, Mutability::Not)
@@ -758,24 +758,24 @@ impl<'hir> LoweringContext<'_, 'hir> {
758758

759759
let (generics, kind) = match i.kind {
760760
AssocItemKind::Static(ref ty, _, ref default) // Let's pretend this is a `const`.
761-
| AssocItemKind::Const(ref ty, ref default) => {
761+
| AssocItemKind::Const(_, ref ty, ref default) => {
762762
let ty = self.lower_ty(ty, ImplTraitContext::disallowed());
763763
let body = default.as_ref().map(|x| self.lower_const_body(i.span, Some(x)));
764764
(hir::Generics::empty(), hir::TraitItemKind::Const(ty, body))
765765
}
766-
AssocItemKind::Fn(ref sig, ref generics, None) => {
766+
AssocItemKind::Fn(_, ref sig, ref generics, None) => {
767767
let names = self.lower_fn_params_to_names(&sig.decl);
768768
let (generics, sig) =
769769
self.lower_method_sig(generics, sig, trait_item_def_id, false, None);
770770
(generics, hir::TraitItemKind::Method(sig, hir::TraitMethod::Required(names)))
771771
}
772-
AssocItemKind::Fn(ref sig, ref generics, Some(ref body)) => {
772+
AssocItemKind::Fn(_, ref sig, ref generics, Some(ref body)) => {
773773
let body_id = self.lower_fn_body_block(i.span, &sig.decl, Some(body));
774774
let (generics, sig) =
775775
self.lower_method_sig(generics, sig, trait_item_def_id, false, None);
776776
(generics, hir::TraitItemKind::Method(sig, hir::TraitMethod::Provided(body_id)))
777777
}
778-
AssocItemKind::TyAlias(ref generics, ref bounds, ref default) => {
778+
AssocItemKind::TyAlias(_, ref generics, ref bounds, ref default) => {
779779
let ty = default.as_ref().map(|x| self.lower_ty(x, ImplTraitContext::disallowed()));
780780
let generics = self.lower_generics(generics, ImplTraitContext::disallowed());
781781
let kind = hir::TraitItemKind::Type(
@@ -801,11 +801,11 @@ impl<'hir> LoweringContext<'_, 'hir> {
801801
fn lower_trait_item_ref(&mut self, i: &AssocItem) -> hir::TraitItemRef {
802802
let (kind, has_default) = match &i.kind {
803803
AssocItemKind::Static(_, _, default) // Let's pretend this is a `const` for recovery.
804-
| AssocItemKind::Const(_, default) => {
804+
| AssocItemKind::Const(_, _, default) => {
805805
(hir::AssocItemKind::Const, default.is_some())
806806
}
807-
AssocItemKind::TyAlias(_, _, default) => (hir::AssocItemKind::Type, default.is_some()),
808-
AssocItemKind::Fn(sig, _, default) => {
807+
AssocItemKind::TyAlias(_, _, _, default) => (hir::AssocItemKind::Type, default.is_some()),
808+
AssocItemKind::Fn(_, sig, _, default) => {
809809
(hir::AssocItemKind::Method { has_self: sig.decl.has_self() }, default.is_some())
810810
}
811811
AssocItemKind::Macro(..) => unimplemented!(),
@@ -823,15 +823,15 @@ impl<'hir> LoweringContext<'_, 'hir> {
823823
fn lower_impl_item(&mut self, i: &AssocItem) -> hir::ImplItem<'hir> {
824824
let impl_item_def_id = self.resolver.definitions().local_def_id(i.id);
825825

826-
let (generics, kind) = match i.kind {
827-
AssocItemKind::Static(ref ty, _, ref expr) | AssocItemKind::Const(ref ty, ref expr) => {
826+
let (generics, kind) = match &i.kind {
827+
AssocItemKind::Static(ty, _, expr) | AssocItemKind::Const(_, ty, expr) => {
828828
let ty = self.lower_ty(ty, ImplTraitContext::disallowed());
829829
(
830830
hir::Generics::empty(),
831831
hir::ImplItemKind::Const(ty, self.lower_const_body(i.span, expr.as_deref())),
832832
)
833833
}
834-
AssocItemKind::Fn(ref sig, ref generics, ref body) => {
834+
AssocItemKind::Fn(_, sig, generics, body) => {
835835
self.current_item = Some(i.span);
836836
let asyncness = sig.header.asyncness;
837837
let body_id =
@@ -847,7 +847,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
847847

848848
(generics, hir::ImplItemKind::Method(sig, body_id))
849849
}
850-
AssocItemKind::TyAlias(ref generics, _, ref ty) => {
850+
AssocItemKind::TyAlias(_, generics, _, ty) => {
851851
let generics = self.lower_generics(generics, ImplTraitContext::disallowed());
852852
let kind = match ty {
853853
None => {
@@ -876,7 +876,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
876876
attrs: self.lower_attrs(&i.attrs),
877877
generics,
878878
vis: self.lower_visibility(&i.vis, None),
879-
defaultness: self.lower_defaultness(i.defaultness, true /* [1] */),
879+
defaultness: self.lower_defaultness(i.kind.defaultness(), true /* [1] */),
880880
kind,
881881
span: i.span,
882882
}
@@ -890,17 +890,17 @@ impl<'hir> LoweringContext<'_, 'hir> {
890890
ident: i.ident,
891891
span: i.span,
892892
vis: self.lower_visibility(&i.vis, Some(i.id)),
893-
defaultness: self.lower_defaultness(i.defaultness, true /* [1] */),
893+
defaultness: self.lower_defaultness(i.kind.defaultness(), true /* [1] */),
894894
kind: match &i.kind {
895895
AssocItemKind::Static(..) // Let's pretend this is a `const` for recovery.
896896
| AssocItemKind::Const(..) => hir::AssocItemKind::Const,
897-
AssocItemKind::TyAlias(_, _, ty) => {
897+
AssocItemKind::TyAlias(.., ty) => {
898898
match ty.as_deref().and_then(|ty| ty.kind.opaque_top_hack()) {
899899
None => hir::AssocItemKind::Type,
900900
Some(_) => hir::AssocItemKind::OpaqueTy,
901901
}
902902
}
903-
AssocItemKind::Fn(sig, _, _) => {
903+
AssocItemKind::Fn(_, sig, ..) => {
904904
hir::AssocItemKind::Method { has_self: sig.decl.has_self() }
905905
}
906906
AssocItemKind::Macro(..) => unimplemented!(),

‎src/librustc_ast_lowering/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
462462
ItemKind::Struct(_, ref generics)
463463
| ItemKind::Union(_, ref generics)
464464
| ItemKind::Enum(_, ref generics)
465-
| ItemKind::TyAlias(ref generics, ..)
465+
| ItemKind::TyAlias(_, ref generics, ..)
466466
| ItemKind::Trait(_, _, ref generics, ..) => {
467467
let def_id = self.lctx.resolver.definitions().local_def_id(item.id);
468468
let count = generics
@@ -490,7 +490,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
490490
self.lctx.allocate_hir_id_counter(item.id);
491491
let owner = match (&item.kind, ctxt) {
492492
// Ignore patterns in trait methods without bodies.
493-
(AssocItemKind::Fn(_, _, None), AssocCtxt::Trait) => None,
493+
(AssocItemKind::Fn(_, _, _, None), AssocCtxt::Trait) => None,
494494
_ => Some(item.id),
495495
};
496496
self.with_hir_id_owner(owner, |this| visit::walk_assoc_item(this, item, ctxt));

‎src/librustc_ast_passes/ast_validation.rs

+16-11
Original file line numberDiff line numberDiff line change
@@ -881,7 +881,8 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
881881
.emit();
882882
}
883883
}
884-
ItemKind::Fn(ref sig, ref generics, ref body) => {
884+
ItemKind::Fn(def, ref sig, ref generics, ref body) => {
885+
self.check_defaultness(item.span, def);
885886
self.check_const_fn_const_generic(item.span, sig, generics);
886887

887888
if body.is_none() {
@@ -965,15 +966,17 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
965966
self.err_handler().span_err(item.span, "unions cannot have zero fields");
966967
}
967968
}
968-
ItemKind::Const(.., None) => {
969+
ItemKind::Const(def, .., None) => {
970+
self.check_defaultness(item.span, def);
969971
let msg = "free constant item without body";
970972
self.error_item_without_body(item.span, "constant", msg, " = <expr>;");
971973
}
972974
ItemKind::Static(.., None) => {
973975
let msg = "free static item without body";
974976
self.error_item_without_body(item.span, "static", msg, " = <expr>;");
975977
}
976-
ItemKind::TyAlias(_, ref bounds, ref body) => {
978+
ItemKind::TyAlias(def, _, ref bounds, ref body) => {
979+
self.check_defaultness(item.span, def);
977980
if body.is_none() {
978981
let msg = "free type alias without body";
979982
self.error_item_without_body(item.span, "type", msg, " = <type>;");
@@ -988,11 +991,13 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
988991

989992
fn visit_foreign_item(&mut self, fi: &'a ForeignItem) {
990993
match &fi.kind {
991-
ForeignItemKind::Fn(sig, _, body) => {
994+
ForeignItemKind::Fn(def, sig, _, body) => {
995+
self.check_defaultness(fi.span, *def);
992996
self.check_foreign_fn_bodyless(fi.ident, body.as_deref());
993997
self.check_foreign_fn_headerless(fi.ident, fi.span, sig.header);
994998
}
995-
ForeignItemKind::TyAlias(generics, bounds, body) => {
999+
ForeignItemKind::TyAlias(def, generics, bounds, body) => {
1000+
self.check_defaultness(fi.span, *def);
9961001
self.check_foreign_kind_bodyless(fi.ident, "type", body.as_ref().map(|b| b.span));
9971002
self.check_type_no_bounds(bounds, "`extern` blocks");
9981003
self.check_foreign_ty_genericless(generics);
@@ -1233,19 +1238,19 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
12331238
}
12341239

12351240
fn visit_assoc_item(&mut self, item: &'a AssocItem, ctxt: AssocCtxt) {
1236-
if ctxt == AssocCtxt::Trait {
1237-
self.check_defaultness(item.span, item.defaultness);
1241+
if ctxt == AssocCtxt::Trait || !self.in_trait_impl {
1242+
self.check_defaultness(item.span, item.kind.defaultness());
12381243
}
12391244

12401245
if ctxt == AssocCtxt::Impl {
12411246
match &item.kind {
1242-
AssocItemKind::Const(_, body) => {
1247+
AssocItemKind::Const(_, _, body) => {
12431248
self.check_impl_item_provided(item.span, body, "constant", " = <expr>;");
12441249
}
1245-
AssocItemKind::Fn(_, _, body) => {
1250+
AssocItemKind::Fn(_, _, _, body) => {
12461251
self.check_impl_item_provided(item.span, body, "function", " { <body> }");
12471252
}
1248-
AssocItemKind::TyAlias(_, bounds, body) => {
1253+
AssocItemKind::TyAlias(_, _, bounds, body) => {
12491254
self.check_impl_item_provided(item.span, body, "type", " = <type>;");
12501255
self.check_type_no_bounds(bounds, "`impl`s");
12511256
}
@@ -1255,7 +1260,7 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
12551260

12561261
if ctxt == AssocCtxt::Trait || self.in_trait_impl {
12571262
self.invalid_visibility(&item.vis, None);
1258-
if let AssocItemKind::Fn(sig, _, _) = &item.kind {
1263+
if let AssocItemKind::Fn(_, sig, _, _) = &item.kind {
12591264
self.check_trait_fn_not_const(sig.header.constness);
12601265
self.check_trait_fn_not_async(item.span, sig.header.asyncness);
12611266
}

‎src/librustc_ast_passes/feature_gate.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
372372
gate_feature_post!(&self, decl_macro, i.span, msg);
373373
}
374374

375-
ast::ItemKind::TyAlias(_, _, Some(ref ty)) => self.check_impl_trait(&ty),
375+
ast::ItemKind::TyAlias(_, _, _, Some(ref ty)) => self.check_impl_trait(&ty),
376376

377377
_ => {}
378378
}
@@ -543,17 +543,17 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
543543
}
544544

545545
fn visit_assoc_item(&mut self, i: &'a ast::AssocItem, ctxt: AssocCtxt) {
546-
if let ast::Defaultness::Default(_) = i.defaultness {
546+
if let ast::Defaultness::Default(_) = i.kind.defaultness() {
547547
gate_feature_post!(&self, specialization, i.span, "specialization is unstable");
548548
}
549549

550550
match i.kind {
551-
ast::AssocItemKind::Fn(ref sig, _, _) => {
551+
ast::AssocItemKind::Fn(_, ref sig, _, _) => {
552552
if let (ast::Const::Yes(_), AssocCtxt::Trait) = (sig.header.constness, ctxt) {
553553
gate_feature_post!(&self, const_fn, i.span, "const fn is unstable");
554554
}
555555
}
556-
ast::AssocItemKind::TyAlias(ref generics, _, ref ty) => {
556+
ast::AssocItemKind::TyAlias(_, ref generics, _, ref ty) => {
557557
if let (Some(_), AssocCtxt::Trait) = (ty, ctxt) {
558558
gate_feature_post!(
559559
&self,

0 commit comments

Comments
 (0)