Fix writing JSON spans as separate documents

Author: killercup

output_derive/tests/structs.rs

@@ -35,7 +35,7 @@ fn struct_with_named_fields_of_primitive_types() -> Result<(), output::Error> {
 
     assert_eq!(
         json.to_string(),
-        "{\"code\":42,\"name\":\"info\",\"message\":\"Derive works\"}\n\n"
+        "{\"code\":42,\"name\":\"info\",\"message\":\"Derive works\"}\n"
     );
 
     Ok(())
@@ -57,7 +57,7 @@ fn tuple_struct_of_primitive_types() -> Result<(), output::Error> {
 
     assert_eq!(human.to_string(), "(42, Derive works)\n");
 
-    assert_eq!(json.to_string(), "[42,\"Derive works\"]\n\n");
+    assert_eq!(json.to_string(), "[42,\"Derive works\"]\n");
 
     Ok(())
 }

src/components/span.rs

@@ -112,8 +112,12 @@ impl Render for Span {
     }
 
     fn render_json(&self, fmt: &mut json::Formatter) -> Result<(), Error> {
-        for item in &self.items {
-            item.render_json(fmt)?;
+        let len = self.items.len();
+        for i in 0..len {
+            self.items[i].render_json(fmt)?;
+            if i < len - 1 {
+                fmt.write_separator()?;
+            }
         }
         Ok(())
     }
@@ -138,7 +142,7 @@ mod test {
 
         let json = json::test();
         item.render_json(&mut json.formatter())?;
-        assert_eq!(json.to_string(), "\"one\"\n\"two\"\n\"three\"\n");
+        assert_eq!(json.to_string(), "\"one\"\n\"two\"\n\"three\"");
         Ok(())
     }
 

src/components/text.rs

@@ -43,7 +43,7 @@ mod test {
 
             let json = json::test();
             item.render_json(&mut json.formatter()).unwrap();
-            prop_assert_eq!(json.to_string(), json!(s).to_string() + "\n");
+            prop_assert_eq!(json.to_string(), json!(s).to_string());
         }
     }
 }

src/json.rs

@@ -242,7 +242,7 @@ mod test_helper {
     ///
     ///     assert_eq!(
     ///         test_target.to_string(),
-    ///         "{\"author\":\"Pascal\",\"body\":\"Lorem ipsum dolor\"}\n\n",
+    ///         "{\"author\":\"Pascal\",\"body\":\"Lorem ipsum dolor\"}\n",
     ///     );
     ///     Ok(())
     /// }