From bf48910ed89d68048d3f17920168be4f81fffd19 Mon Sep 17 00:00:00 2001
From: mc1098 <m.cripps1@uni.brighton.ac.uk>
Date: Wed, 4 Aug 2021 13:50:22 +0100
Subject: [PATCH] Fix multiple field enum tokens

A small change so that enums with multiple fields are comma seperated.
---
 packages/yew-router-macro/src/routable_derive.rs              | 2 +-
 packages/yew-router-macro/tests/routable_derive/valid-pass.rs | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/yew-router-macro/src/routable_derive.rs b/packages/yew-router-macro/src/routable_derive.rs
index 4de9b447537..29aa8bcc880 100644
--- a/packages/yew-router-macro/src/routable_derive.rs
+++ b/packages/yew-router-macro/src/routable_derive.rs
@@ -119,7 +119,7 @@ impl Routable {
                         //named fields have idents
                         it.ident.as_ref().unwrap()
                     });
-                    quote! { Self::#ident { #(#fields: params.get(stringify!(#fields))?.parse().ok()?)*, } }
+                    quote! { Self::#ident { #(#fields: params.get(stringify!(#fields))?.parse().ok()?,)* } }
                 }
                 Fields::Unnamed(_) => unreachable!(), // already checked
             };
diff --git a/packages/yew-router-macro/tests/routable_derive/valid-pass.rs b/packages/yew-router-macro/tests/routable_derive/valid-pass.rs
index 5cdad0c7f65..fa1dd5e0617 100644
--- a/packages/yew-router-macro/tests/routable_derive/valid-pass.rs
+++ b/packages/yew-router-macro/tests/routable_derive/valid-pass.rs
@@ -6,6 +6,8 @@ enum Routes {
     One,
     #[at("/two/:id")]
     Two { id: u32 },
+    #[at("/:a/:b")]
+    Three { a: u32, b: u32 },
     #[at("/404")]
     #[not_found]
     NotFound,