Merge branch 'master' of https://github.com/thepowersgang/mrustc

3 files changed, 20 insertions, 15 deletions

diff --git a/src/ast/ast.cpp b/src/ast/ast.cpp
index 39250a41..df5f4d5a 100644
--- a/src/ast/ast.cpp
+++ b/src/ast/ast.cpp
@@ -175,6 +175,9 @@ Enum Enum::clone() const
 Struct Struct::clone() const
 {
     TU_MATCHA( (m_data), (e),
+    (Unit,
+        return Struct(m_params.clone());
+        ),
     (Tuple,
         decltype(e.ents)    new_fields;
         for(const auto& f : e.ents)
diff --git a/src/ast/ast.hpp b/src/ast/ast.hpp
index b63cb2e6..c067001a 100644
--- a/src/ast/ast.hpp
+++ b/src/ast/ast.hpp
@@ -319,6 +319,7 @@ public:
 
 TAGGED_UNION_EX(StructData, (), Struct,
     (
+    (Unit, struct {}),
     (Tuple, struct {
         ::std::vector<TupleItem>    ents;
         }),
@@ -339,6 +340,11 @@ public:
     StructData  m_data;
 
     Struct() {}
+    Struct(GenericParams params):
+        m_params( mv$(params) ),
+        m_data( StructData::make_Unit({}) )
+    {
+    }
     Struct( GenericParams params, ::std::vector<StructItem> fields ):
         m_params( move(params) ),
         m_data( StructData::make_Struct({mv$(fields)}) )
diff --git a/src/ast/dump.cpp b/src/ast/dump.cpp
index a6c298b0..0d77054c 100644
--- a/src/ast/dump.cpp
+++ b/src/ast/dump.cpp
@@ -991,22 +991,18 @@ void RustPrinter::handle_struct(const AST::Struct& s)
     print_params(s.params());
 
     TU_MATCH(AST::StructData, (s.m_data), (e),
+    (Unit,
+        m_os << " /* unit-like */\n";
+        print_bounds(s.params());
+        m_os << indent() << ";\n";
+        ),
     (Tuple,
-        if( e.ents.size() == 0 )
-        {
-            m_os << " /* unit-like */\n";
-            print_bounds(s.params());
-            m_os << indent() << ";\n";
-        }
-        else
-        {
-            m_os << "(";
-            for( const auto& i : e.ents )
-                m_os << i.m_type << ", ";
-            m_os << ")\n";
-            print_bounds(s.params());
-            m_os << indent() << ";\n";
-        }
+        m_os << "(";
+        for( const auto& i : e.ents )
+            m_os << i.m_type << ", ";
+        m_os << ")\n";
+        print_bounds(s.params());
+        m_os << indent() << ";\n";
         ),
     (Struct,
         m_os << "\n";