0.8.5 resolved serializing unicode chars and erros around escaped

characters #53

Author: maciejhirsz

Cargo.toml

@@ -9,4 +9,3 @@ license = "MIT"
 
 [dependencies]
 itoa = "0.1"
-dtoa = "0.1"

src/codegen.rs

@@ -3,7 +3,6 @@ use std::num::FpCategory;
 use JsonValue;
 
 extern crate itoa;
-extern crate dtoa;
 
 const QU: u8 = b'"';
 const BS: u8 = b'\\';
@@ -59,13 +58,18 @@ pub trait Generator {
 
     #[inline(never)]
     fn write_string_complex(&mut self, string: &str, mut start: usize) {
+        self.write(string[ .. start].as_bytes());
+
         for (index, ch) in string.bytes().enumerate().skip(start) {
             let escape = ESCAPED[ch as usize];
             if escape > 0 {
                 self.write(string[start .. index].as_bytes());
                 self.write(&[b'\\', escape]);
                 start = index + 1;
             }
+            if escape == b'u' {
+                write!(self.get_writer(), "{:04x}", ch).unwrap();
+            }
         }
         self.write(string[start ..].as_bytes());
 
@@ -93,13 +97,12 @@ pub trait Generator {
                 if num.fract() == 0.0 && num.abs() < 1e19 {
                     itoa::write(self.get_writer(), num as i64).unwrap();
                 } else {
-                    dtoa::write(self.get_writer(), num).unwrap();
-                    // let abs = num.abs();
-                    // if abs < 1e-15 || abs > 1e19 {
-                    //     write!(self.get_writer(), "{:e}", num).unwrap();
-                    // } else {
-                    //     write!(self.get_writer(), "{}", num).unwrap();
-                    // }
+                    let abs = num.abs();
+                    if abs < 1e-15 || abs > 1e19 {
+                        write!(self.get_writer(), "{:e}", num).unwrap();
+                    } else {
+                        write!(self.get_writer(), "{}", num).unwrap();
+                    }
                 }
             },
             FpCategory::Zero => {
@@ -177,7 +180,9 @@ impl DumpGenerator {
     }
 
     pub fn consume(self) -> String {
-        String::from_utf8(self.code).unwrap()
+        // Original strings were unicode, numbers are all ASCII,
+        // therefore this is safe.
+        unsafe { String::from_utf8_unchecked(self.code) }
     }
 }
 
@@ -221,7 +226,7 @@ impl PrettyGenerator {
     }
 
     pub fn consume(self) -> String {
-        String::from_utf8(self.code).unwrap()
+        unsafe { String::from_utf8_unchecked(self.code) }
     }
 }
 

src/lib.rs

@@ -235,6 +235,7 @@ 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) {
         let mut gen = WriterGenerator::new(writer);
         gen.write_json(self);

tests/lib.rs

@@ -291,6 +291,16 @@ mod unit {
         assert_eq!(stringify("foo/bar"), r#""foo/bar""#);
     }
 
+    #[test]
+    fn stringify_escaped() {
+        assert_eq!(stringify("http://www.google.com/\t"), r#""http://www.google.com/\t""#);
+    }
+
+    #[test]
+    fn stringify_control_escaped() {
+        assert_eq!(stringify("foo\u{7f}bar\u{0}baz"), r#""foo\u007fbar\u0000baz""#);
+    }
+
     #[test]
     fn stringify_pretty_object() {
         let object = object!{