Shrink ast::Block.

nnethercote · nnethercote · commit 2ec25a1b8e81 · 2022-09-06T17:31:47.000+10:00
diff --git a/compiler/rustc_ast/src/ast.rs b/compiler/rustc_ast/src/ast.rs
@@ -559,7 +559,7 @@ pub enum MetaItemKind {
 #[derive(Clone, Encodable, Decodable, Debug)]
 pub struct Block {
     /// The statements in the block.
-    pub stmts: Vec<Stmt>,
+    pub stmts: Box<[Stmt]>,
     pub id: NodeId,
     /// Distinguishes between `unsafe { ... }` and `{ ... }`.
     pub rules: BlockCheckMode,
@@ -2440,7 +2440,7 @@ pub struct ForeignMod {
 
 #[derive(Clone, Encodable, Decodable, Debug)]
 pub struct EnumDef {
-    pub variants: Vec<Variant>,
+    pub variants: Box<[Variant]>,
 }
 /// Enum variant.
 #[derive(Clone, Encodable, Decodable, Debug)]
@@ -3039,7 +3039,7 @@ mod size_asserts {
     static_assert_size!(AssocItem, 104);
     static_assert_size!(AssocItemKind, 32);
     static_assert_size!(Attribute, 32);
-    static_assert_size!(Block, 48);
+    static_assert_size!(Block, 40);
     static_assert_size!(Expr, 104);
     static_assert_size!(ExprKind, 72);
     static_assert_size!(Fn, 192);
diff --git a/compiler/rustc_ast/src/visit.rs b/compiler/rustc_ast/src/visit.rs
@@ -369,7 +369,7 @@ pub fn walk_item<'a, V: Visitor<'a>>(visitor: &mut V, item: &'a Item) {
 }
 
 pub fn walk_enum_def<'a, V: Visitor<'a>>(visitor: &mut V, enum_definition: &'a EnumDef) {
-    walk_list!(visitor, visit_variant, &enum_definition.variants);
+    walk_list!(visitor, visit_variant, enum_definition.variants.iter());
 }
 
 pub fn walk_variant<'a, V: Visitor<'a>>(visitor: &mut V, variant: &'a Variant)
@@ -714,7 +714,7 @@ pub fn walk_field_def<'a, V: Visitor<'a>>(visitor: &mut V, field: &'a FieldDef)
 }
 
 pub fn walk_block<'a, V: Visitor<'a>>(visitor: &mut V, block: &'a Block) {
-    walk_list!(visitor, visit_stmt, &block.stmts);
+    walk_list!(visitor, visit_stmt, block.stmts.iter());
 }
 
 pub fn walk_stmt<'a, V: Visitor<'a>>(visitor: &mut V, statement: &'a Stmt) {
diff --git a/compiler/rustc_ast_passes/src/ast_validation.rs b/compiler/rustc_ast_passes/src/ast_validation.rs
@@ -1145,7 +1145,7 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
                 return; // Avoid visiting again.
             }
             ItemKind::Enum(ref def, _) => {
-                for variant in &def.variants {
+                for variant in def.variants.iter() {
                     self.invalid_visibility(&variant.vis, None);
                     for field in variant.data.fields() {
                         self.invalid_visibility(&field.vis, None);
diff --git a/compiler/rustc_ast_passes/src/feature_gate.rs b/compiler/rustc_ast_passes/src/feature_gate.rs
@@ -477,7 +477,7 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
             }
 
             ast::ItemKind::Enum(ast::EnumDef { ref variants, .. }, ..) => {
-                for variant in variants {
+                for variant in variants.iter() {
                     match (&variant.data, &variant.disr_expr) {
                         (ast::VariantData::Unit(..), _) => {}
                         (_, Some(disr_expr)) => gate_feature_post!(
diff --git a/compiler/rustc_builtin_macros/src/deriving/clone.rs b/compiler/rustc_builtin_macros/src/deriving/clone.rs
@@ -137,7 +137,7 @@ fn cs_clone_simple(
                 process_variant(vdata);
             }
             StaticEnum(enum_def, ..) => {
-                for variant in &enum_def.variants {
+                for variant in enum_def.variants.iter() {
                     process_variant(&variant.data);
                 }
             }
diff --git a/compiler/rustc_builtin_macros/src/deriving/cmp/eq.rs b/compiler/rustc_builtin_macros/src/deriving/cmp/eq.rs
@@ -80,7 +80,7 @@ fn cs_total_eq_assert(
             process_variant(vdata);
         }
         StaticEnum(enum_def, ..) => {
-            for variant in &enum_def.variants {
+            for variant in enum_def.variants.iter() {
                 process_variant(&variant.data);
             }
         }
diff --git a/compiler/rustc_builtin_macros/src/deriving/generic/mod.rs b/compiler/rustc_builtin_macros/src/deriving/generic/mod.rs
@@ -799,7 +799,7 @@ impl<'a> TraitDef<'a> {
     ) -> P<ast::Item> {
         let mut field_tys = Vec::new();
 
-        for variant in &enum_def.variants {
+        for variant in enum_def.variants.iter() {
             field_tys.extend(variant.data.fields().iter().map(|field| field.ty.clone()));
         }
 
diff --git a/compiler/rustc_builtin_macros/src/deriving/mod.rs b/compiler/rustc_builtin_macros/src/deriving/mod.rs
@@ -97,7 +97,7 @@ fn call_unreachable(cx: &ExtCtxt<'_>, span: Span) -> P<ast::Expr> {
     let call = cx.expr_call_global(span, path, vec![]);
 
     cx.expr_block(P(ast::Block {
-        stmts: vec![cx.stmt_expr(call)],
+        stmts: vec![cx.stmt_expr(call)].into_boxed_slice(),
         id: ast::DUMMY_NODE_ID,
         rules: ast::BlockCheckMode::Unsafe(ast::CompilerGenerated),
         span,
diff --git a/compiler/rustc_builtin_macros/src/format.rs b/compiler/rustc_builtin_macros/src/format.rs
@@ -1090,7 +1090,7 @@ impl<'a, 'b> Context<'a, 'b> {
             let path = self.ecx.std_path(&[sym::fmt, sym::UnsafeArg, sym::new]);
             let unsafe_arg = self.ecx.expr_call_global(self.macsp, path, Vec::new());
             let unsafe_expr = self.ecx.expr_block(P(ast::Block {
-                stmts: vec![self.ecx.stmt_expr(unsafe_arg)],
+                stmts: vec![self.ecx.stmt_expr(unsafe_arg)].into_boxed_slice(),
                 id: ast::DUMMY_NODE_ID,
                 rules: BlockCheckMode::Unsafe(UnsafeSource::CompilerGenerated),
                 span: self.macsp,
diff --git a/compiler/rustc_expand/src/build.rs b/compiler/rustc_expand/src/build.rs
@@ -229,7 +229,7 @@ impl<'a> ExtCtxt<'a> {
     }
     pub fn block(&self, span: Span, stmts: Vec<ast::Stmt>) -> P<ast::Block> {
         P(ast::Block {
-            stmts,
+            stmts: stmts.into_boxed_slice(),
             id: ast::DUMMY_NODE_ID,
             rules: BlockCheckMode::Default,
             span,
diff --git a/compiler/rustc_lint/src/unused.rs b/compiler/rustc_lint/src/unused.rs
@@ -797,7 +797,7 @@ impl EarlyLintPass for UnusedParens {
                     None,
                     None,
                 );
-                for stmt in &block.stmts {
+                for stmt in block.stmts.iter() {
                     <Self as UnusedDelimLint>::check_stmt(self, cx, stmt);
                 }
                 if let Some(e) = else_ {
@@ -960,7 +960,7 @@ impl UnusedDelimLint for UnusedBraces {
                 //      (do not lint `struct A<const N: usize>; let _: A<{ 2 + 3 }>;`)
                 //
                 // FIXME(const_generics): handle paths when #67075 is fixed.
-                if let [stmt] = inner.stmts.as_slice() {
+                if let [stmt] = &*inner.stmts {
                     if let ast::StmtKind::Expr(ref expr) = stmt.kind {
                         if !Self::is_expr_delims_necessary(expr, followed_by_block, false)
                             && (ctx != UnusedDelimsCtx::AnonConst
diff --git a/compiler/rustc_parse/src/parser/stmt.rs b/compiler/rustc_parse/src/parser/stmt.rs
@@ -645,7 +645,7 @@ impl<'a> Parser<'a> {
 
     pub(super) fn mk_block(&self, stmts: Vec<Stmt>, rules: BlockCheckMode, span: Span) -> P<Block> {
         P(Block {
-            stmts,
+            stmts: stmts.into_boxed_slice(),
             id: DUMMY_NODE_ID,
             rules,
             span,
diff --git a/compiler/rustc_resolve/src/access_levels.rs b/compiler/rustc_resolve/src/access_levels.rs
@@ -149,7 +149,7 @@ impl<'r, 'ast> Visitor<'ast> for AccessLevelsVisitor<'ast, 'r> {
 
             ast::ItemKind::Enum(EnumDef { ref variants }, _) => {
                 self.set_bindings_access_level(def_id);
-                for variant in variants {
+                for variant in variants.iter() {
                     let variant_def_id = self.r.local_def_id(variant.id);
                     let variant_level = self.r.access_levels.map.get(&variant_def_id).copied();
                     for field in variant.data.fields() {
diff --git a/compiler/rustc_resolve/src/late.rs b/compiler/rustc_resolve/src/late.rs
@@ -3662,7 +3662,7 @@ impl<'a: 'ast, 'b, 'ast> LateResolutionVisitor<'a, 'b, 'ast> {
             Some(block.span);
         }
         // Descend into the block.
-        for stmt in &block.stmts {
+        for stmt in block.stmts.iter() {
             if let StmtKind::Item(ref item) = stmt.kind
                 && let ItemKind::MacroDef(..) = item.kind {
                 num_macro_definition_ribs += 1;
diff --git a/src/test/ui/stats/hir-stats.stderr b/src/test/ui/stats/hir-stats.stderr
@@ -21,39 +21,39 @@ ast-stats-1 - MacCall                   32 ( 0.4%)             1
 ast-stats-1 - Expr                      96 ( 1.1%)             3
 ast-stats-1 Param                    160 ( 1.9%)             4            40
 ast-stats-1 FnDecl                   200 ( 2.4%)             5            40
-ast-stats-1 Variant                  240 ( 2.8%)             2           120
-ast-stats-1 Block                    288 ( 3.4%)             6            48
+ast-stats-1 Variant                  240 ( 2.9%)             2           120
+ast-stats-1 Block                    240 ( 2.9%)             6            40
 ast-stats-1 GenericBound             352 ( 4.2%)             4            88
 ast-stats-1 - Trait                    352 ( 4.2%)             4
 ast-stats-1 AssocItem                416 ( 4.9%)             4           104
 ast-stats-1 - TyAlias                  208 ( 2.5%)             2
 ast-stats-1 - Fn                       208 ( 2.5%)             2
-ast-stats-1 GenericParam             520 ( 6.1%)             5           104
-ast-stats-1 PathSegment              720 ( 8.5%)            30            24
-ast-stats-1 Expr                     832 ( 9.8%)             8           104
+ast-stats-1 GenericParam             520 ( 6.2%)             5           104
+ast-stats-1 PathSegment              720 ( 8.6%)            30            24
+ast-stats-1 Expr                     832 ( 9.9%)             8           104
 ast-stats-1 - Path                     104 ( 1.2%)             1
 ast-stats-1 - Match                    104 ( 1.2%)             1
 ast-stats-1 - Struct                   104 ( 1.2%)             1
 ast-stats-1 - Lit                      208 ( 2.5%)             2
 ast-stats-1 - Block                    312 ( 3.7%)             3
-ast-stats-1 Pat                      840 ( 9.9%)             7           120
+ast-stats-1 Pat                      840 (10.0%)             7           120
 ast-stats-1 - Struct                   120 ( 1.4%)             1
 ast-stats-1 - Wild                     120 ( 1.4%)             1
 ast-stats-1 - Ident                    600 ( 7.1%)             5
-ast-stats-1 Ty                     1_344 (15.9%)            14            96
+ast-stats-1 Ty                     1_344 (16.0%)            14            96
 ast-stats-1 - Rptr                      96 ( 1.1%)             1
 ast-stats-1 - Ptr                       96 ( 1.1%)             1
 ast-stats-1 - ImplicitSelf             192 ( 2.3%)             2
 ast-stats-1 - Path                     960 (11.4%)            10
-ast-stats-1 Item                   1_656 (19.6%)             9           184
+ast-stats-1 Item                   1_656 (19.7%)             9           184
 ast-stats-1 - Trait                    184 ( 2.2%)             1
 ast-stats-1 - Enum                     184 ( 2.2%)             1
 ast-stats-1 - ForeignMod               184 ( 2.2%)             1
 ast-stats-1 - Impl                     184 ( 2.2%)             1
 ast-stats-1 - Fn                       368 ( 4.4%)             2
-ast-stats-1 - Use                      552 ( 6.5%)             3
+ast-stats-1 - Use                      552 ( 6.6%)             3
 ast-stats-1 ----------------------------------------------------------------
-ast-stats-1 Total                  8_456
+ast-stats-1 Total                  8_408
 ast-stats-1
 ast-stats-2 POST EXPANSION AST STATS
 ast-stats-2 Name                Accumulated Size         Count     Item Size
@@ -65,55 +65,55 @@ ast-stats-2 - AngleBracketed            64 ( 0.7%)             1
 ast-stats-2 Local                     72 ( 0.8%)             1            72
 ast-stats-2 WherePredicate            72 ( 0.8%)             1            72
 ast-stats-2 - BoundPredicate            72 ( 0.8%)             1
-ast-stats-2 Arm                       96 ( 1.0%)             2            48
-ast-stats-2 ForeignItem               96 ( 1.0%)             1            96
-ast-stats-2 - Fn                        96 ( 1.0%)             1
+ast-stats-2 Arm                       96 ( 1.1%)             2            48
+ast-stats-2 ForeignItem               96 ( 1.1%)             1            96
+ast-stats-2 - Fn                        96 ( 1.1%)             1
 ast-stats-2 InlineAsm                120 ( 1.3%)             1           120
 ast-stats-2 Attribute                128 ( 1.4%)             4            32
-ast-stats-2 - DocComment                32 ( 0.3%)             1
-ast-stats-2 - Normal                    96 ( 1.0%)             3
-ast-stats-2 FieldDef                 160 ( 1.7%)             2            80
-ast-stats-2 Stmt                     160 ( 1.7%)             5            32
-ast-stats-2 - Local                     32 ( 0.3%)             1
-ast-stats-2 - Semi                      32 ( 0.3%)             1
-ast-stats-2 - Expr                      96 ( 1.0%)             3
-ast-stats-2 Param                    160 ( 1.7%)             4            40
+ast-stats-2 - DocComment                32 ( 0.4%)             1
+ast-stats-2 - Normal                    96 ( 1.1%)             3
+ast-stats-2 FieldDef                 160 ( 1.8%)             2            80
+ast-stats-2 Stmt                     160 ( 1.8%)             5            32
+ast-stats-2 - Local                     32 ( 0.4%)             1
+ast-stats-2 - Semi                      32 ( 0.4%)             1
+ast-stats-2 - Expr                      96 ( 1.1%)             3
+ast-stats-2 Param                    160 ( 1.8%)             4            40
 ast-stats-2 FnDecl                   200 ( 2.2%)             5            40
 ast-stats-2 Variant                  240 ( 2.6%)             2           120
-ast-stats-2 Block                    288 ( 3.1%)             6            48
-ast-stats-2 GenericBound             352 ( 3.8%)             4            88
-ast-stats-2 - Trait                    352 ( 3.8%)             4
-ast-stats-2 AssocItem                416 ( 4.5%)             4           104
+ast-stats-2 Block                    240 ( 2.6%)             6            40
+ast-stats-2 GenericBound             352 ( 3.9%)             4            88
+ast-stats-2 - Trait                    352 ( 3.9%)             4
+ast-stats-2 AssocItem                416 ( 4.6%)             4           104
 ast-stats-2 - TyAlias                  208 ( 2.3%)             2
 ast-stats-2 - Fn                       208 ( 2.3%)             2
 ast-stats-2 GenericParam             520 ( 5.7%)             5           104
-ast-stats-2 PathSegment              792 ( 8.6%)            33            24
-ast-stats-2 Pat                      840 ( 9.1%)             7           120
+ast-stats-2 PathSegment              792 ( 8.7%)            33            24
+ast-stats-2 Pat                      840 ( 9.2%)             7           120
 ast-stats-2 - Struct                   120 ( 1.3%)             1
 ast-stats-2 - Wild                     120 ( 1.3%)             1
-ast-stats-2 - Ident                    600 ( 6.5%)             5
+ast-stats-2 - Ident                    600 ( 6.6%)             5
 ast-stats-2 Expr                     936 (10.2%)             9           104
 ast-stats-2 - Path                     104 ( 1.1%)             1
 ast-stats-2 - Match                    104 ( 1.1%)             1
 ast-stats-2 - Struct                   104 ( 1.1%)             1
 ast-stats-2 - InlineAsm                104 ( 1.1%)             1
 ast-stats-2 - Lit                      208 ( 2.3%)             2
 ast-stats-2 - Block                    312 ( 3.4%)             3
-ast-stats-2 Ty                     1_344 (14.6%)            14            96
-ast-stats-2 - Rptr                      96 ( 1.0%)             1
-ast-stats-2 - Ptr                       96 ( 1.0%)             1
+ast-stats-2 Ty                     1_344 (14.7%)            14            96
+ast-stats-2 - Rptr                      96 ( 1.1%)             1
+ast-stats-2 - Ptr                       96 ( 1.1%)             1
 ast-stats-2 - ImplicitSelf             192 ( 2.1%)             2
 ast-stats-2 - Path                     960 (10.5%)            10
-ast-stats-2 Item                   2_024 (22.0%)            11           184
+ast-stats-2 Item                   2_024 (22.2%)            11           184
 ast-stats-2 - Trait                    184 ( 2.0%)             1
 ast-stats-2 - Enum                     184 ( 2.0%)             1
 ast-stats-2 - ExternCrate              184 ( 2.0%)             1
 ast-stats-2 - ForeignMod               184 ( 2.0%)             1
 ast-stats-2 - Impl                     184 ( 2.0%)             1
 ast-stats-2 - Fn                       368 ( 4.0%)             2
-ast-stats-2 - Use                      736 ( 8.0%)             4
+ast-stats-2 - Use                      736 ( 8.1%)             4
 ast-stats-2 ----------------------------------------------------------------
-ast-stats-2 Total                  9_184
+ast-stats-2 Total                  9_136
 ast-stats-2
 hir-stats HIR STATS
 hir-stats Name                Accumulated Size         Count     Item Size

Original file line number	Diff line number	Diff line change
`@@ -369,7 +369,7 @@ pub fn walk_item<'a, V: Visitor<'a>>(visitor: &mut V, item: &'a Item) {`
`369`	`369`	`}`
`370`	`370`
`371`	`371`	`pub fn walk_enum_def<'a, V: Visitor<'a>>(visitor: &mut V, enum_definition: &'a EnumDef) {`
`372`		`- walk_list!(visitor, visit_variant, &enum_definition.variants);`
	`372`	`+ walk_list!(visitor, visit_variant, enum_definition.variants.iter());`
`373`	`373`	`}`
`374`	`374`
`375`	`375`	`pub fn walk_variant<'a, V: Visitor<'a>>(visitor: &mut V, variant: &'a Variant)`
`@@ -714,7 +714,7 @@ pub fn walk_field_def<'a, V: Visitor<'a>>(visitor: &mut V, field: &'a FieldDef)`
`714`	`714`	`}`
`715`	`715`
`716`	`716`	`pub fn walk_block<'a, V: Visitor<'a>>(visitor: &mut V, block: &'a Block) {`
`717`		`- walk_list!(visitor, visit_stmt, &block.stmts);`
	`717`	`+ walk_list!(visitor, visit_stmt, block.stmts.iter());`
`718`	`718`	`}`
`719`	`719`
`720`	`720`	`pub fn walk_stmt<'a, V: Visitor<'a>>(visitor: &mut V, statement: &'a Stmt) {`
Original file line number	Diff line number	Diff line change
`@@ -1145,7 +1145,7 @@ impl<'a> Visitor<'a> for AstValidator<'a> {`
`1145`	`1145`	`return; // Avoid visiting again.`
`1146`	`1146`	`}`
`1147`	`1147`	`ItemKind::Enum(ref def, _) => {`
`1148`		`- for variant in &def.variants {`
	`1148`	`+ for variant in def.variants.iter() {`
`1149`	`1149`	`self.invalid_visibility(&variant.vis, None);`
`1150`	`1150`	`for field in variant.data.fields() {`
`1151`	`1151`	`self.invalid_visibility(&field.vis, None);`
Original file line number	Diff line number	Diff line change
`@@ -477,7 +477,7 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {`
`477`	`477`	`}`
`478`	`478`
`479`	`479`	`ast::ItemKind::Enum(ast::EnumDef { ref variants, .. }, ..) => {`
`480`		`- for variant in variants {`
	`480`	`+ for variant in variants.iter() {`
`481`	`481`	`match (&variant.data, &variant.disr_expr) {`
`482`	`482`	`(ast::VariantData::Unit(..), _) => {}`
`483`	`483`	`(_, Some(disr_expr)) => gate_feature_post!(`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ fn cs_clone_simple(`
`137`	`137`	`process_variant(vdata);`
`138`	`138`	`}`
`139`	`139`	`StaticEnum(enum_def, ..) => {`
`140`		`- for variant in &enum_def.variants {`
	`140`	`+ for variant in enum_def.variants.iter() {`
`141`	`141`	`process_variant(&variant.data);`
`142`	`142`	`}`
`143`	`143`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ fn cs_total_eq_assert(`
`80`	`80`	`process_variant(vdata);`
`81`	`81`	`}`
`82`	`82`	`StaticEnum(enum_def, ..) => {`
`83`		`- for variant in &enum_def.variants {`
	`83`	`+ for variant in enum_def.variants.iter() {`
`84`	`84`	`process_variant(&variant.data);`
`85`	`85`	`}`
`86`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -799,7 +799,7 @@ impl<'a> TraitDef<'a> {`
`799`	`799`	`) -> P<ast::Item> {`
`800`	`800`	`let mut field_tys = Vec::new();`
`801`	`801`
`802`		`- for variant in &enum_def.variants {`
	`802`	`+ for variant in enum_def.variants.iter() {`
`803`	`803`	`field_tys.extend(variant.data.fields().iter().map(\|field\| field.ty.clone()));`
`804`	`804`	`}`
`805`	`805`
Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ impl<'a> ExtCtxt<'a> {`
`229`	`229`	`}`
`230`	`230`	`pub fn block(&self, span: Span, stmts: Vec<ast::Stmt>) -> P<ast::Block> {`
`231`	`231`	`P(ast::Block {`
`232`		`- stmts,`
	`232`	`+ stmts: stmts.into_boxed_slice(),`
`233`	`233`	`id: ast::DUMMY_NODE_ID,`
`234`	`234`	`rules: BlockCheckMode::Default,`
`235`	`235`	`span,`