derive: Add proper derive(Clone) for unions

gcc/rust/ChangeLog:

	* ast/rust-ast-builder.cc (AstBuilder::struct_expr_struct): New function.
	(AstBuilder::let): Likewise.
	(AstBuilder::struct_expr): Likewise.
	(AstBuilder::struct_expr_field): Likewise.
	(AstBuilder::field_access): Likewise.
	(AstBuilder::wildcard): Likewise.
	* ast/rust-ast-builder.h: Likewise.
	* expand/rust-derive-clone.cc (DeriveClone::visit_union): Implement
	properly.

gcc/testsuite/ChangeLog:

	* rust/compile/derive_macro4.rs: New test.
	* rust/compile/derive_macro6.rs: New test.

1 files changed, 16 insertions, 10 deletions

diff --git a/gcc/rust/ast/rust-ast-builder.cc b/gcc/rust/ast/rust-ast-builder.cc
index d37f143..b630cfa 100644
--- a/gcc/rust/ast/rust-ast-builder.cc
+++ b/gcc/rust/ast/rust-ast-builder.cc
@@ -82,13 +82,6 @@ AstBuilder::path_in_expression (std::vector<std::string> &&segments)
 }
 
 std::unique_ptr<Expr>
-AstBuilder::struct_expr_struct (std::string struct_name)
-{
-  return std::unique_ptr<Expr> (
-    new StructExprStruct (path_in_expression ({struct_name}), {}, {}, loc));
-}
-
-std::unique_ptr<Expr>
 AstBuilder::block (std::vector<std::unique_ptr<Stmt>> &&stmts,
 		   std::unique_ptr<Expr> &&tail_expr)
 {
@@ -100,9 +93,9 @@ std::unique_ptr<Stmt>
 AstBuilder::let (std::unique_ptr<Pattern> pattern, std::unique_ptr<Type> type,
 		 std::unique_ptr<Expr> init)
 {
-  return std::unique_ptr<Stmt> (
-    new LetStmt (/* needs a pattern here, not just a name */ nullptr,
-		 std::move (init), std::move (type), {}, loc));
+  return std::unique_ptr<Stmt> (new LetStmt (std::move (pattern),
+					     std::move (init), std::move (type),
+					     {}, loc));
 }
 
 std::unique_ptr<Expr>
@@ -119,6 +112,13 @@ AstBuilder::deref (std::unique_ptr<Expr> &&of)
 }
 
 std::unique_ptr<Expr>
+AstBuilder::struct_expr_struct (std::string struct_name)
+{
+  return std::unique_ptr<Expr> (
+    new StructExprStruct (path_in_expression ({struct_name}), {}, {}, loc));
+}
+
+std::unique_ptr<Expr>
 AstBuilder::struct_expr (std::string struct_name,
 			 std::vector<std::unique_ptr<StructExprField>> &&fields)
 {
@@ -142,5 +142,11 @@ AstBuilder::field_access (std::unique_ptr<Expr> &&instance, std::string field)
     new FieldAccessExpr (std::move (instance), field, {}, loc));
 }
 
+std::unique_ptr<Pattern>
+AstBuilder::wildcard ()
+{
+  return std::unique_ptr<Pattern> (new WildcardPattern (loc));
+}
+
 } // namespace AST
 } // namespace Rust