Box the ForeignMod in ItemKind::ForeignMod.

Author: nnethercote

compiler/rustc_ast/src/ast.rs

@@ -2839,7 +2839,7 @@ pub enum ItemKind {
     /// An external module (`extern`).
     ///
     /// E.g., `extern {}` or `extern "C" {}`.
-    ForeignMod(ForeignMod),
+    ForeignMod(P<ForeignMod>),
     /// Module-level inline assembly (from `global_asm!()`).
     GlobalAsm(Box<InlineAsm>),
     /// A type alias (`type`).

compiler/rustc_ast_passes/src/ast_validation.rs

@@ -1234,16 +1234,16 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
                 walk_list!(self, visit_attribute, &item.attrs);
                 return; // Avoid visiting again.
             }
-            ItemKind::ForeignMod(ForeignMod { abi, unsafety, .. }) => {
+            ItemKind::ForeignMod(ref foreign_mod) => {
                 let old_item = mem::replace(&mut self.extern_mod, Some(item));
                 self.invalid_visibility(
                     &item.vis,
                     Some("place qualifiers on individual foreign items instead"),
                 );
-                if let Unsafe::Yes(span) = unsafety {
+                if let Unsafe::Yes(span) = foreign_mod.unsafety {
                     self.err_handler().span_err(span, "extern block cannot be declared unsafe");
                 }
-                if abi.is_none() {
+                if foreign_mod.abi.is_none() {
                     self.maybe_lint_missing_abi(item.span, item.id);
                 }
                 visit::walk_item(self, item);

compiler/rustc_parse/src/parser/item.rs

@@ -1039,11 +1039,11 @@ impl<'a> Parser<'a> {
             unsafety = Unsafe::Yes(self.token.span);
             self.eat_keyword(kw::Unsafe);
         }
-        let module = ast::ForeignMod {
+        let module = P(ast::ForeignMod {
             unsafety,
             abi,
             items: self.parse_item_list(attrs, |p| p.parse_foreign_item(ForceCollect::No))?,
-        };
+        });
         Ok((Ident::empty(), ItemKind::ForeignMod(module)))
     }
 

compiler/rustc_resolve/src/access_levels.rs

@@ -3,7 +3,6 @@ use rustc_ast::visit;
 use rustc_ast::visit::Visitor;
 use rustc_ast::Crate;
 use rustc_ast::EnumDef;
-use rustc_ast::ForeignMod;
 use rustc_ast::NodeId;
 use rustc_hir::def_id::LocalDefId;
 use rustc_hir::def_id::CRATE_DEF_ID;
@@ -184,8 +183,8 @@ impl<'r, 'ast> Visitor<'ast> for AccessLevelsVisitor<'ast, 'r> {
                 self.prev_level = orig_level;
             }
 
-            ast::ItemKind::ForeignMod(ForeignMod { ref items, .. }) => {
-                for nested in items {
+            ast::ItemKind::ForeignMod(ref foreign_mod) => {
+                for nested in foreign_mod.items.iter() {
                     if nested.vis.kind.is_pub() {
                         self.set_access_level(nested.id, access_level);
                     }