No breakage with 0.10.1, PrettyWriteGenerator to take variable number

of spaces (#88, #89)

Author: maciejhirsz

src/codegen.rs

@@ -316,11 +316,11 @@ pub struct PrettyWriterGenerator<'a, W: 'a + Write> {
 }
 
 impl<'a, W> PrettyWriterGenerator<'a, W> where W: 'a + Write {
-    pub fn new(writer: &'a mut W) -> Self {
+    pub fn new(writer: &'a mut W, spaces: u16) -> Self {
         PrettyWriterGenerator {
             writer: writer,
             dent: 0,
-            spaces_per_indent: 4,
+            spaces_per_indent: spaces,
         }
     }
 }

src/value/mod.rs

@@ -102,14 +102,24 @@ impl JsonValue {
         gen.consume()
     }
 
-    /// Dumps the JSON as byte stream into an instance of `std::io::Write`.
-    pub fn to_writer<W: Write>(&self, writer: &mut W) -> io::Result<()> {
+    /// Writes the JSON as byte stream into an implementor of `std::io::Write`.
+    ///
+    /// This method is deprecated as it will panic on io errors, use `write` instead.
+    #[deprecated(since="0.10.2", note="use `JsonValue::write` instead")]
+    pub fn to_writer<W: Write>(&self, writer: &mut W) {
+        let mut gen = WriterGenerator::new(writer);
+        gen.write_json(self).expect("Deprecated");
+    }
+
+    /// Writes the JSON as byte stream into an implementor of `std::io::Write`.
+    pub fn write<W: Write>(&self, writer: &mut W) -> io::Result<()> {
         let mut gen = WriterGenerator::new(writer);
         gen.write_json(self)
     }
 
-    pub fn to_writer_pretty<W: Write>(&self, writer: &mut W) -> io::Result<()> {
-        let mut gen = PrettyWriterGenerator::new(writer);
+    /// Writes the JSON as byte stream into an implementor of `std::io::Write`.
+    pub fn write_pretty<W: Write>(&self, writer: &mut W, spaces: u16) -> io::Result<()> {
+        let mut gen = PrettyWriterGenerator::new(writer, spaces);
         gen.write_json(self)
     }
 

tests/value.rs

@@ -517,7 +517,7 @@ fn writer_generator() {
 
     let mut buf = Vec::new();
 
-    data.to_writer(&mut buf).expect("Can't fail with a Vec");
+    data.write(&mut buf).expect("Can't fail with a Vec");
 
     assert_eq!(String::from_utf8(buf).unwrap(), r#"{"foo":["bar",100,true]}"#);
 }
@@ -530,7 +530,7 @@ fn pretty_writer_generator() {
 
     let mut buf = Vec::new();
 
-    data.to_writer_pretty(&mut buf).expect("Can't fail with a Vec");
+    data.write_pretty(&mut buf, 4).expect("Can't fail with a Vec");
 
     assert_eq!(String::from_utf8(buf).unwrap(), "{\n    \"foo\": [\n        \"bar\",\n        100,\n        true\n    ]\n}");
 }