fix(vm): Accept trailing comma in record macros

Fixes #770
gluon-lang · Aug 5, 2019 · f35c0b9 · f35c0b9
1 parent 6848e3c
commit f35c0b9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/examples/marshalling.rs b/examples/marshalling.rs
@@ -84,9 +84,9 @@ fn marshal_enum() -> Result<()> {
     "#;
     type SourceType<'thread> = record_type! {
         unwrap_b => api::FunctionRef<'thread, fn (Enum) -> i32>,
-        value => Enum
+        value => Enum,
     };
-    let (record_p! { mut unwrap_b, value }, _) =
+    let (record_p! { mut unwrap_b, value, }, _) =
         Compiler::new().run_expr::<SourceType>(&thread, "example", source)?;
     match value {
         Enum::C(ref a, ref b) => {

diff --git a/vm/src/api/mac.rs b/vm/src/api/mac.rs
@@ -403,7 +403,7 @@ macro_rules! row_type {
 /// ```
 #[macro_export(local_inner_macros)]
 macro_rules! record_type {
-    ($($field: ident => $value: ty),*) => {
+    ($($field: ident => $value: ty),* $(,)?) => {
         $crate::api::Record<
             $crate::frunk_core::hlist::HNil,
             record_type_inner!($($field => $value),*)
@@ -438,7 +438,7 @@ macro_rules! record_p_impl {
 /// ```
 #[macro_export(local_inner_macros)]
 macro_rules! record_p {
-    ($($field: pat),*) => {
+    ($($field: pat),* $(,)?) => {
         $crate::api::Record {
             fields: record_p_impl!($($field),*),
             type_fields: _