From 590f896160dfd4969d4a142e50d9b983dd7e54e6 Mon Sep 17 00:00:00 2001
From: Dan Gohman <dev@sunfishcode.online>
Date: Tue, 13 Sep 2022 08:56:43 -0700
Subject: [PATCH 1/2] Remove the special case for empty records.

WebAssembly/component-model#104 is closed, so remove the corresponding
special case from wit-bindgen too.
---
 crates/wit-parser/src/mangle.rs | 100 +++++++++++++-------------------
 1 file changed, 40 insertions(+), 60 deletions(-)

diff --git a/crates/wit-parser/src/mangle.rs b/crates/wit-parser/src/mangle.rs
index 7b3b9275e..92c0e4192 100644
--- a/crates/wit-parser/src/mangle.rs
+++ b/crates/wit-parser/src/mangle.rs
@@ -81,18 +81,14 @@ impl Interface {
     }
 
     fn mangle_recordtype(&self, fields: &[Field]) -> String {
-        if fields.is_empty() {
-            "record {}".to_owned()
-        } else {
-            format!(
-                "record {{ {} }}",
-                fields
-                    .iter()
-                    .map(|f| format!("{}: {}", f.name, self.mangle_valtype(f.ty)))
-                    .collect::<Vec<_>>()
-                    .join(", ")
-            )
-        }
+        format!(
+            "record {{ {} }}",
+            fields
+                .iter()
+                .map(|f| format!("{}: {}", f.name, self.mangle_valtype(f.ty)))
+                .collect::<Vec<_>>()
+                .join(", ")
+        )
     }
 
     fn mangle_tupletype(&self, ts: &[Type]) -> String {
@@ -106,63 +102,47 @@ impl Interface {
     }
 
     fn mangle_flags(&self, labels: &[Flag]) -> String {
-        if labels.is_empty() {
-            "flags {}".to_owned()
-        } else {
-            format!(
-                "flags {{ {} }}",
-                labels
-                    .iter()
-                    .map(|f| f.name.clone())
-                    .collect::<Vec<_>>()
-                    .join(", ")
-            )
-        }
+        format!(
+            "flags {{ {} }}",
+            labels
+                .iter()
+                .map(|f| f.name.clone())
+                .collect::<Vec<_>>()
+                .join(", ")
+        )
     }
 
     fn mangle_varianttype(&self, cases: &[Case]) -> String {
-        if cases.is_empty() {
-            "variant {}".to_owned()
-        } else {
-            format!(
-                "variant {{ {} }}",
-                cases
-                    .iter()
-                    .map(|c| format!("{}{}", c.name, format!("({})", self.mangle_valtype(c.ty)),))
-                    .collect::<Vec<_>>()
-                    .join(", ")
-            )
-        }
+        format!(
+            "variant {{ {} }}",
+            cases
+                .iter()
+                .map(|c| format!("{}{}", c.name, format!("({})", self.mangle_valtype(c.ty)),))
+                .collect::<Vec<_>>()
+                .join(", ")
+        )
     }
 
     fn mangle_enumtype(&self, labels: &[EnumCase]) -> String {
-        if labels.is_empty() {
-            "enum {}".to_owned()
-        } else {
-            format!(
-                "enum {{ {} }}",
-                labels
-                    .iter()
-                    .map(|l| l.name.clone())
-                    .collect::<Vec<_>>()
-                    .join(", ")
-            )
-        }
+        format!(
+            "enum {{ {} }}",
+            labels
+                .iter()
+                .map(|l| l.name.clone())
+                .collect::<Vec<_>>()
+                .join(", ")
+        )
     }
 
     fn mangle_uniontype(&self, cases: &[UnionCase]) -> String {
-        if cases.is_empty() {
-            "union {}".to_owned()
-        } else {
-            format!(
-                "union {{ {} }}",
-                cases
-                    .iter()
-                    .map(|case| self.mangle_valtype(case.ty))
-                    .collect::<Vec<_>>()
-                    .join(", ")
-            )
-        }
+        format!(
+            "union {{ {} }}",
+            cases
+                .iter()
+                .map(|case| self.mangle_valtype(case.ty))
+                .collect::<Vec<_>>()
+                .join(", ")
+        )
     }
 
     fn mangle_optiontype(&self, t: Type) -> String {

From db1958c1d0bbd467f0e3a12e13c2e27acdfa3e38 Mon Sep 17 00:00:00 2001
From: Dan Gohman <dev@sunfishcode.online>
Date: Tue, 13 Sep 2022 09:26:41 -0700
Subject: [PATCH 2/2] Update unit tests.

---
 crates/wit-parser/src/mangle.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/crates/wit-parser/src/mangle.rs b/crates/wit-parser/src/mangle.rs
index 92c0e4192..8abe99ff1 100644
--- a/crates/wit-parser/src/mangle.rs
+++ b/crates/wit-parser/src/mangle.rs
@@ -266,7 +266,7 @@ mod tests {
         let iface = Interface::default();
         assert_eq!(
             iface.mangle_valtypedef(&TypeDefKind::Record(Record { fields: Vec::new() })),
-            "record {}"
+            "record {  }"
         );
         assert_eq!(
             iface.mangle_valtypedef(&TypeDefKind::Record(Record {
@@ -323,7 +323,7 @@ mod tests {
         let iface = Interface::default();
         assert_eq!(
             iface.mangle_valtypedef(&TypeDefKind::Flags(Flags { flags: Vec::new() })),
-            "flags {}"
+            "flags {  }"
         );
         assert_eq!(
             iface.mangle_valtypedef(&TypeDefKind::Flags(Flags {
@@ -356,7 +356,7 @@ mod tests {
         let iface = Interface::default();
         assert_eq!(
             iface.mangle_valtypedef(&TypeDefKind::Variant(Variant { cases: Vec::new() })),
-            "variant {}"
+            "variant {  }"
         );
         assert_eq!(
             iface.mangle_valtypedef(&TypeDefKind::Variant(Variant {
@@ -392,7 +392,7 @@ mod tests {
         let iface = Interface::default();
         assert_eq!(
             iface.mangle_valtypedef(&TypeDefKind::Enum(Enum { cases: Vec::new() })),
-            "enum {}"
+            "enum {  }"
         );
         assert_eq!(
             iface.mangle_valtypedef(&TypeDefKind::Enum(Enum {
@@ -425,7 +425,7 @@ mod tests {
         let iface = Interface::default();
         assert_eq!(
             iface.mangle_valtypedef(&TypeDefKind::Union(Union { cases: Vec::new() })),
-            "union {}"
+            "union {  }"
         );
         assert_eq!(
             iface.mangle_valtypedef(&TypeDefKind::Union(Union {