Box the ForeignMod in ItemKind::ForeignMod.

nnethercote · nnethercote · commit e71c37537c7c · 2022-08-10T13:58:27.000+10:00
diff --git a/compiler/rustc_ast/src/ast.rs b/compiler/rustc_ast/src/ast.rs
@@ -2835,7 +2835,7 @@ pub enum ItemKind {
     /// E.g., `mod foo;` or `mod foo { .. }`.
     /// `unsafe` keyword on modules is accepted syntactically for macro DSLs, but not
     /// semantically by Rust.
-    Mod(Unsafe, ModKind),
+    Mod(Unsafe, P<ModKind>),
     /// An external module (`extern`).
     ///
     /// E.g., `extern {}` or `extern "C" {}`.
@@ -3043,8 +3043,8 @@ mod size_asserts {
     static_assert_size!(GenericBound, 88);
     static_assert_size!(Generics, 72);
     static_assert_size!(Impl, 200);
-    static_assert_size!(Item, 152);
-    static_assert_size!(ItemKind, 64);
+    static_assert_size!(Item, 136);
+    static_assert_size!(ItemKind, 48);
     static_assert_size!(Lit, 48);
     static_assert_size!(Pat, 120);
     static_assert_size!(Path, 40);
diff --git a/compiler/rustc_ast/src/mut_visit.rs b/compiler/rustc_ast/src/mut_visit.rs
@@ -1027,7 +1027,7 @@ pub fn noop_visit_item_kind<T: MutVisitor>(kind: &mut ItemKind, vis: &mut T) {
         }
         ItemKind::Mod(unsafety, mod_kind) => {
             visit_unsafety(unsafety, vis);
-            match mod_kind {
+            match &mut **mod_kind {
                 ModKind::Loaded(items, _inline, ModSpans { inner_span, inject_use_span }) => {
                     vis.visit_span(inner_span);
                     vis.visit_span(inject_use_span);
diff --git a/compiler/rustc_ast/src/visit.rs b/compiler/rustc_ast/src/visit.rs
@@ -311,7 +311,7 @@ pub fn walk_item<'a, V: Visitor<'a>>(visitor: &mut V, item: &'a Item) {
                 FnKind::Fn(FnCtxt::Free, item.ident, sig, &item.vis, generics, body.as_deref());
             visitor.visit_fn(kind, item.span, item.id)
         }
-        ItemKind::Mod(_unsafety, ref mod_kind) => match mod_kind {
+        ItemKind::Mod(_unsafety, ref mod_kind) => match &**mod_kind {
             ModKind::Loaded(items, _inline, _inner_span) => {
                 walk_list!(visitor, visit_item, items)
             }
diff --git a/compiler/rustc_ast_lowering/src/item.rs b/compiler/rustc_ast_lowering/src/item.rs
@@ -272,7 +272,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
                     hir::ItemKind::Fn(sig, generics, body_id)
                 })
             }
-            ItemKind::Mod(_, ref mod_kind) => match mod_kind {
+            ItemKind::Mod(_, ref mod_kind) => match &**mod_kind {
                 ModKind::Loaded(items, _, spans) => {
                     hir::ItemKind::Mod(self.lower_mod(items, spans))
                 }
diff --git a/compiler/rustc_ast_passes/src/ast_validation.rs b/compiler/rustc_ast_passes/src/ast_validation.rs
@@ -1284,7 +1284,7 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
                     self.err_handler().span_err(span, "module cannot be declared unsafe");
                 }
                 // Ensure that `path` attributes on modules are recorded as used (cf. issue #35584).
-                if !matches!(mod_kind, ModKind::Loaded(_, Inline::Yes, _))
+                if !matches!(&**mod_kind, ModKind::Loaded(_, Inline::Yes, _))
                     && !self.session.contains_name(&item.attrs, sym::path)
                 {
                     self.check_mod_file_item_asciionly(item.ident);
diff --git a/compiler/rustc_ast_pretty/src/pprust/state/item.rs b/compiler/rustc_ast_pretty/src/pprust/state/item.rs
@@ -183,7 +183,7 @@ impl<'a> State<'a> {
                 }));
                 self.print_ident(item.ident);
 
-                match mod_kind {
+                match &**mod_kind {
                     ModKind::Loaded(items, ..) => {
                         self.nbsp();
                         self.bopen();
diff --git a/compiler/rustc_builtin_macros/src/test_harness.rs b/compiler/rustc_builtin_macros/src/test_harness.rs
@@ -129,7 +129,9 @@ impl<'a> MutVisitor for TestHarnessGenerator<'a> {
 
         // We don't want to recurse into anything other than mods, since
         // mods or tests inside of functions will break things
-        if let ast::ItemKind::Mod(_, ModKind::Loaded(.., ref spans)) = item.kind {
+        if let ast::ItemKind::Mod(_, ref mod_kind) = item.kind
+            && let ModKind::Loaded(.., ref spans) = &**mod_kind
+        {
             let ast::ModSpans { inner_span: span, inject_use_span: _ } = *spans;
             let prev_tests = mem::take(&mut self.tests);
             noop_visit_item_kind(&mut item.kind, self);
diff --git a/compiler/rustc_expand/src/expand.rs b/compiler/rustc_expand/src/expand.rs
@@ -673,10 +673,8 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
                             if matches!(attr.style, AttrStyle::Inner)
                                 && matches!(
                                     item_inner.kind,
-                                    ItemKind::Mod(
-                                        _,
-                                        ModKind::Unloaded | ModKind::Loaded(_, Inline::No, _),
-                                    )
+                                    ItemKind::Mod(_, ref mod_kind) if 
+                                        matches!(&**mod_kind, ModKind::Unloaded | ModKind::Loaded(_, Inline::No, _)),
                                 ) =>
                         {
                             rustc_parse::fake_token_stream_for_item(
@@ -800,7 +798,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
             fn visit_item(&mut self, item: &'ast ast::Item) {
                 match &item.kind {
                     ItemKind::Mod(_, mod_kind)
-                        if !matches!(mod_kind, ModKind::Loaded(_, Inline::Yes, _)) =>
+                        if !matches!(&**mod_kind, ModKind::Loaded(_, Inline::Yes, _)) =>
                     {
                         feature_err(
                             self.parse_sess,
@@ -1069,7 +1067,7 @@ impl InvocationCollectorNode for P<ast::Item> {
         };
 
         let ecx = &mut collector.cx;
-        let (file_path, dir_path, dir_ownership) = match mod_kind {
+        let (file_path, dir_path, dir_ownership) = match &**mod_kind {
             ModKind::Loaded(_, inline, _) => {
                 // Inline `mod foo { ... }`, but we still need to push directories.
                 let (dir_path, dir_ownership) = mod_dir_path(
@@ -1107,7 +1105,7 @@ impl InvocationCollectorNode for P<ast::Item> {
                     );
                 }
 
-                *mod_kind = ModKind::Loaded(items, Inline::No, spans);
+                **mod_kind = ModKind::Loaded(items, Inline::No, spans);
                 node.attrs = attrs;
                 if node.attrs.len() > old_attrs_len {
                     // If we loaded an out-of-line module and added some inner attributes,
diff --git a/compiler/rustc_expand/src/parse/tests.rs b/compiler/rustc_expand/src/parse/tests.rs
@@ -319,7 +319,7 @@ fn out_of_line_mod() {
         .unwrap();
 
         if let ast::ItemKind::Mod(_, ref mod_kind) = item.kind {
-            assert!(matches!(mod_kind, ast::ModKind::Loaded(items, ..) if items.len() == 2));
+            assert!(matches!(&**mod_kind, ast::ModKind::Loaded(items, ..) if items.len() == 2));
         } else {
             panic!();
         }
diff --git a/compiler/rustc_parse/src/parser/item.rs b/compiler/rustc_parse/src/parser/item.rs
@@ -36,15 +36,15 @@ impl<'a> Parser<'a> {
         let unsafety = self.parse_unsafety();
         self.expect_keyword(kw::Mod)?;
         let id = self.parse_ident()?;
-        let mod_kind = if self.eat(&token::Semi) {
+        let mod_kind = P(if self.eat(&token::Semi) {
             ModKind::Unloaded
         } else {
             self.expect(&token::OpenDelim(Delimiter::Brace))?;
             let (mut inner_attrs, items, inner_span) =
                 self.parse_mod(&token::CloseDelim(Delimiter::Brace))?;
             attrs.append(&mut inner_attrs);
             ModKind::Loaded(items, Inline::Yes, inner_span)
-        };
+        });
         Ok((id, ItemKind::Mod(unsafety, mod_kind)))
     }
 
diff --git a/compiler/rustc_resolve/src/diagnostics.rs b/compiler/rustc_resolve/src/diagnostics.rs
@@ -2671,7 +2671,9 @@ impl<'tcx> visit::Visitor<'tcx> for UsePlacementFinder {
 
     fn visit_item(&mut self, item: &'tcx ast::Item) {
         if self.target_module == item.id {
-            if let ItemKind::Mod(_, ModKind::Loaded(items, _inline, mod_spans)) = &item.kind {
+            if let ItemKind::Mod(_, mod_kind) = &item.kind
+                && let ModKind::Loaded(items, _inline, mod_spans) = &**mod_kind
+            {
                 let inject = mod_spans.inject_use_span;
                 if is_span_suitable_for_use_injection(inject) {
                     self.first_legal_span = Some(inject);
diff --git a/compiler/rustc_resolve/src/macros.rs b/compiler/rustc_resolve/src/macros.rs
@@ -164,7 +164,9 @@ fn soft_custom_inner_attributes_gate(path: &ast::Path, invoc: &Invocation) -> bo
         [seg1, seg2] if seg1.ident.name == sym::rustfmt && seg2.ident.name == sym::skip => {
             if let InvocationKind::Attr { item, .. } = &invoc.kind {
                 if let Annotatable::Item(item) = item {
-                    if let ItemKind::Mod(_, ModKind::Loaded(_, Inline::No, _)) = item.kind {
+                    if let ItemKind::Mod(_, ref mod_kind) = item.kind
+                        && let ModKind::Loaded(_, Inline::No, _) = &**mod_kind
+                    {
                         return true;
                     }
                 }
diff --git a/src/tools/clippy/clippy_lints/src/duplicate_mod.rs b/src/tools/clippy/clippy_lints/src/duplicate_mod.rs
@@ -63,7 +63,8 @@ impl_lint_pass!(DuplicateMod => [DUPLICATE_MOD]);
 
 impl EarlyLintPass for DuplicateMod {
     fn check_item(&mut self, cx: &EarlyContext<'_>, item: &Item) {
-        if let ItemKind::Mod(_, ModKind::Loaded(_, Inline::No, mod_spans)) = &item.kind
+        if let ItemKind::Mod(_, mod_kind) = &item.kind
+            && let ModKind::Loaded(_, Inline::No, mod_spans) = &**mod_kind
             && let FileName::Real(real) = cx.sess().source_map().span_to_filename(mod_spans.inner_span)
             && let Some(local_path) = real.into_local_path()
             && let Ok(absolute_path) = local_path.canonicalize()
diff --git a/src/tools/clippy/clippy_lints/src/single_component_path_imports.rs b/src/tools/clippy/clippy_lints/src/single_component_path_imports.rs
@@ -114,9 +114,11 @@ fn track_uses(
     }
 
     match &item.kind {
-        ItemKind::Mod(_, ModKind::Loaded(ref items, ..)) => {
-            check_mod(cx, items);
-        },
+        ItemKind::Mod(_, mod_kind) => {
+            if let ModKind::Loaded(ref items, ..) = **mod_kind {
+                check_mod(cx, items);
+            }
+        }
         ItemKind::MacroDef(MacroDef { macro_rules: true, .. }) => {
             macros.push(item.ident.name);
         },
diff --git a/src/tools/clippy/clippy_utils/src/ast_utils.rs b/src/tools/clippy/clippy_utils/src/ast_utils.rs
@@ -273,7 +273,7 @@ pub fn eq_item_kind(l: &ItemKind, r: &ItemKind) -> bool {
         },
         (Mod(lu, lmk), Mod(ru, rmk)) => {
             lu == ru
-                && match (lmk, rmk) {
+                && match (&**lmk, &**rmk) {
                     (ModKind::Loaded(litems, linline, _), ModKind::Loaded(ritems, rinline, _)) => {
                         linline == rinline && over(litems, ritems, |l, r| eq_item(l, r, eq_item_kind))
                     },
diff --git a/src/tools/rustfmt/src/items.rs b/src/tools/rustfmt/src/items.rs
@@ -3320,10 +3320,12 @@ pub(crate) fn rewrite_extern_crate(
 
 /// Returns `true` for `mod foo;`, false for `mod foo { .. }`.
 pub(crate) fn is_mod_decl(item: &ast::Item) -> bool {
-    !matches!(
-        item.kind,
-        ast::ItemKind::Mod(_, ast::ModKind::Loaded(_, ast::Inline::Yes, _))
-    )
+    if let ast::ItemKind::Mod(_, ref mod_kind) = item.kind {
+        if let ast::ModKind::Loaded(_, ast::Inline::Yes, _) = &**mod_kind {
+            return false;
+        }
+    }
+    true
 }
 
 pub(crate) fn is_use_item(item: &ast::Item) -> bool {
diff --git a/src/tools/rustfmt/src/modules.rs b/src/tools/rustfmt/src/modules.rs
@@ -156,7 +156,7 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> {
                     &module_item.item,
                     Module::new(
                         module_item.item.span,
-                        Some(Cow::Owned(sub_mod_kind.clone())),
+                        Some(Cow::Owned((**sub_mod_kind).clone())),
                         Cow::Owned(vec![]),
                         Cow::Owned(vec![]),
                     ),
@@ -183,7 +183,7 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> {
                     &item,
                     Module::new(
                         span,
-                        Some(Cow::Owned(sub_mod_kind.clone())),
+                        Some(Cow::Owned((**sub_mod_kind).clone())),
                         Cow::Owned(vec![]),
                         Cow::Owned(vec![]),
                     ),

Original file line number	Diff line number	Diff line change
`@@ -1027,7 +1027,7 @@ pub fn noop_visit_item_kind<T: MutVisitor>(kind: &mut ItemKind, vis: &mut T) {`
`1027`	`1027`	`}`
`1028`	`1028`	`ItemKind::Mod(unsafety, mod_kind) => {`
`1029`	`1029`	`visit_unsafety(unsafety, vis);`
`1030`		`- match mod_kind {`
	`1030`	`+ match &mut **mod_kind {`
`1031`	`1031`	`ModKind::Loaded(items, _inline, ModSpans { inner_span, inject_use_span }) => {`
`1032`	`1032`	`vis.visit_span(inner_span);`
`1033`	`1033`	`vis.visit_span(inject_use_span);`
Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@ pub fn walk_item<'a, V: Visitor<'a>>(visitor: &mut V, item: &'a Item) {`
`311`	`311`	`FnKind::Fn(FnCtxt::Free, item.ident, sig, &item.vis, generics, body.as_deref());`
`312`	`312`	`visitor.visit_fn(kind, item.span, item.id)`
`313`	`313`	`}`
`314`		`- ItemKind::Mod(_unsafety, ref mod_kind) => match mod_kind {`
	`314`	`+ ItemKind::Mod(_unsafety, ref mod_kind) => match &**mod_kind {`
`315`	`315`	`ModKind::Loaded(items, _inline, _inner_span) => {`
`316`	`316`	`walk_list!(visitor, visit_item, items)`
`317`	`317`	`}`
Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ impl<'hir> LoweringContext<'_, 'hir> {`
`272`	`272`	`hir::ItemKind::Fn(sig, generics, body_id)`
`273`	`273`	`})`
`274`	`274`	`}`
`275`		`- ItemKind::Mod(_, ref mod_kind) => match mod_kind {`
	`275`	`+ ItemKind::Mod(_, ref mod_kind) => match &**mod_kind {`
`276`	`276`	`ModKind::Loaded(items, _, spans) => {`
`277`	`277`	`hir::ItemKind::Mod(self.lower_mod(items, spans))`
`278`	`278`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1284,7 +1284,7 @@ impl<'a> Visitor<'a> for AstValidator<'a> {`
`1284`	`1284`	`self.err_handler().span_err(span, "module cannot be declared unsafe");`
`1285`	`1285`	`}`
`1286`	`1286`	// Ensure that `path` attributes on modules are recorded as used (cf. issue #35584).
`1287`		`- if !matches!(mod_kind, ModKind::Loaded(_, Inline::Yes, _))`
	`1287`	`+ if !matches!(&**mod_kind, ModKind::Loaded(_, Inline::Yes, _))`
`1288`	`1288`	`&& !self.session.contains_name(&item.attrs, sym::path)`
`1289`	`1289`	`{`
`1290`	`1290`	`self.check_mod_file_item_asciionly(item.ident);`
Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,7 @@ fn out_of_line_mod() {`
`319`	`319`	`.unwrap();`
`320`	`320`
`321`	`321`	`if let ast::ItemKind::Mod(_, ref mod_kind) = item.kind {`
`322`		`- assert!(matches!(mod_kind, ast::ModKind::Loaded(items, ..) if items.len() == 2));`
	`322`	`+ assert!(matches!(&**mod_kind, ast::ModKind::Loaded(items, ..) if items.len() == 2));`
`323`	`323`	`} else {`
`324`	`324`	`panic!();`
`325`	`325`	`}`