Merge pull request #129 from Yoric/commas

Resolves #125 - Accept trailing commas in object!{}

Author: maciejhirsz

src/lib.rs

@@ -308,8 +308,12 @@ macro_rules! array {
 /// ```
 #[macro_export]
 macro_rules! object {
+    // Empty object.
     {} => ($crate::JsonValue::new_object());
 
+    // Non-empty object, no trailing comma.
+    //
+    // In this implementation, key/value pairs separated by commas.
     { $( $key:expr => $value:expr ),* } => ({
         use $crate::object::Object;
 
@@ -319,6 +323,21 @@ macro_rules! object {
             object.insert($key, $value.into());
         )*
 
+        $crate::JsonValue::Object(object)
+    });
+
+    // Non-empty object, trailing comma.
+    //
+    // In this implementation, the comma is part of the value.
+    { $( $key:expr => $value:expr, )* } => ({
+        use $crate::object::Object;
+
+        let mut object = Object::new();
+
+        $(
+            object.insert($key, $value.into());
+        )*
+
         $crate::JsonValue::Object(object)
     })
 }

tests/parse.rs

@@ -126,6 +126,7 @@ fn parse_array() {
 
 #[test]
 fn parse_object() {
+    // Without trailing comma
     assert_eq!(parse(r#"
 
     {
@@ -137,6 +138,19 @@ fn parse_object() {
         "foo" => "bar",
         "num" => 10
     });
+
+    // Trailing comma in macro
+    assert_eq!(parse(r#"
+
+    {
+        "foo": "bar",
+        "num": 10
+    }
+
+    "#).unwrap(), object!{
+        "foo" => "bar",
+        "num" => 10,
+    });
 }
 
 #[test]