From dd1d5bca1b2a079cfa005abbb42751530ed9b66c Mon Sep 17 00:00:00 2001
From: yuyi <yuyi98@163.com>
Date: Fri, 9 Jun 2023 22:43:21 +0800
Subject: [PATCH] ast: clean up ast.StructInit (#18387)

---
 cmd/tools/vast/vast.v            | 22 ----------------------
 vlib/v/ast/ast.v                 | 13 -------------
 vlib/v/markused/walker.v         |  3 ---
 vlib/v/transformer/transformer.v |  3 ---
 4 files changed, 41 deletions(-)

diff --git a/cmd/tools/vast/vast.v b/cmd/tools/vast/vast.v
index 0917cc5a0d..93be78afd9 100644
--- a/cmd/tools/vast/vast.v
+++ b/cmd/tools/vast/vast.v
@@ -1567,7 +1567,6 @@ fn (t Tree) struct_init(node ast.StructInit) &Node {
 	obj.add('name_pos', t.pos(node.name_pos))
 	obj.add('update_expr_comments', t.array_node_comment(node.update_expr_comments))
 	obj.add_terse('fields', t.array_node_struct_init_field(node.fields))
-	obj.add_terse('embeds', t.array_node_struct_init_embed(node.embeds))
 	obj.add('pre_comments', t.array_node_comment(node.pre_comments))
 	return obj
 }
@@ -1587,19 +1586,6 @@ fn (t Tree) struct_init_field(node ast.StructInitField) &Node {
 	return obj
 }
 
-fn (t Tree) struct_init_embed(node ast.StructInitEmbed) &Node {
-	mut obj := new_object()
-	obj.add_terse('ast_type', t.string_node('StructInitEmbed'))
-	obj.add_terse('name', t.string_node(node.name))
-	obj.add_terse('expr', t.expr(node.expr))
-	obj.add_terse('typ', t.type_node(node.typ))
-	obj.add_terse('expected_type', t.type_node(node.expected_type))
-	obj.add('comments', t.array_node_comment(node.comments))
-	obj.add('next_comments', t.array_node_comment(node.next_comments))
-	obj.add('pos', t.pos(node.pos))
-	return obj
-}
-
 fn (t Tree) array_init(node ast.ArrayInit) &Node {
 	mut obj := new_object()
 	obj.add_terse('ast_type', t.string_node('ArrayInit'))
@@ -2306,14 +2292,6 @@ fn (t Tree) array_node_if_guard_var(nodes []ast.IfGuardVar) &Node {
 	return arr
 }
 
-fn (t Tree) array_node_struct_init_embed(nodes []ast.StructInitEmbed) &Node {
-	mut arr := new_array()
-	for node in nodes {
-		arr.add_item(t.struct_init_embed(node))
-	}
-	return arr
-}
-
 fn (t Tree) array_node_match_branch(nodes []ast.MatchBranch) &Node {
 	mut arr := new_array()
 	for node in nodes {
diff --git a/vlib/v/ast/ast.v b/vlib/v/ast/ast.v
index 3b0813ac17..b026df8ecc 100644
--- a/vlib/v/ast/ast.v
+++ b/vlib/v/ast/ast.v
@@ -437,18 +437,6 @@ pub mut:
 	parent_type   Type
 }
 
-pub struct StructInitEmbed {
-pub:
-	pos           token.Pos
-	comments      []Comment
-	next_comments []Comment
-pub mut:
-	expr          Expr
-	name          string
-	typ           Type
-	expected_type Type
-}
-
 // `s := Foo{
 //    ...a
 //    field1: 'hello'
@@ -473,7 +461,6 @@ pub mut:
 	is_update_embed      bool
 	has_update_expr      bool // has `...a`
 	fields               []StructInitField
-	embeds               []StructInitEmbed
 	generic_types        []Type
 }
 
diff --git a/vlib/v/markused/walker.v b/vlib/v/markused/walker.v
index 672cdf77b2..b9a64850e2 100644
--- a/vlib/v/markused/walker.v
+++ b/vlib/v/markused/walker.v
@@ -418,9 +418,6 @@ fn (mut w Walker) expr(node_ ast.Expr) {
 			for sif in node.fields {
 				w.expr(sif.expr)
 			}
-			for sie in node.embeds {
-				w.expr(sie.expr)
-			}
 		}
 		ast.TypeOf {
 			w.expr(node.expr)
diff --git a/vlib/v/transformer/transformer.v b/vlib/v/transformer/transformer.v
index c3ab086843..cc51133cda 100644
--- a/vlib/v/transformer/transformer.v
+++ b/vlib/v/transformer/transformer.v
@@ -662,9 +662,6 @@ pub fn (mut t Transformer) expr(mut node ast.Expr) ast.Expr {
 			for mut field in node.fields {
 				field.expr = t.expr(mut field.expr)
 			}
-			for mut embed in node.embeds {
-				embed.expr = t.expr(mut embed.expr)
-			}
 		}
 		ast.UnsafeExpr {
 			node.expr = t.expr(mut node.expr)