Fixed Q_LISTMODEL macro with a single element

Rust sees (ident) as an expression, but (ident,) as a tuple. Fixes #16.
White-Oak · Oct 17, 2016 · 6ebb045 · 6ebb045
1 parent 700962c
commit 6ebb045
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/examples/listmodel_macro.rs b/examples/listmodel_macro.rs
@@ -7,7 +7,13 @@ use qml::*;
 Q_LISTMODEL!{
     pub QTestModel {
         name: String,
-        number: i32,
+        number: i32
+    }
+}
+
+Q_LISTMODEL!{
+    pub QOneMemberModel {
+        name: String
     }
 }
 

diff --git a/src/macros.rs b/src/macros.rs
@@ -288,7 +288,7 @@ macro_rules! Q_OBJECT{
 #[macro_export]
 macro_rules! Q_LISTMODEL{
             (pub $wrapper:ident{
-                $($rolename:ident : $roletype:ty,)*
+                $($rolename:ident : $roletype:ident),*
             }) => {
                 pub struct $wrapper {
                     qalm: Box<QListModel<'static>>,
@@ -322,9 +322,9 @@ macro_rules! Q_LISTMODEL{
 
                     /// Sets a specified data for this model
                     #[allow(unused_mut)]
-                    pub fn set_data(&mut self, vec: Vec<($($roletype),*)>) {
+                    pub fn set_data(&mut self, vec: Vec<($($roletype,)*)>) {
                         self.qalm.set_data(vec.into_iter()
-                        .map(|($($rolename),*)| {
+                        .map(|($($rolename,)*)| {
                             let mut vec = Vec::new();
                             $(
                                 vec.push($rolename.into());