---

yaml
---
r: 153104
b: refs/heads/try2
c: 717de50
h: refs/heads/master
v: v3

Author: erickt

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 83f9f07ec4a339a31650abf7023a584cf7c5ce54
+refs/heads/try2: 717de500eefc2f501f12587fc9626944ab593ff8
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libserialize/json.rs

@@ -256,21 +256,37 @@ fn io_error_to_error(io: io::IoError) -> ParserError {
 pub type EncodeResult = io::IoResult<()>;
 pub type DecodeResult<T> = Result<T, DecoderError>;
 
-fn escape_bytes(writer: &mut io::Writer, s: &[u8]) -> Result<(), io::IoError> {
-    try!(writer.write_str("\""));
-    for byte in s.iter() {
-        match *byte {
-            b'"' => try!(writer.write_str("\\\"")),
-            b'\\' => try!(writer.write_str("\\\\")),
-            b'\x08' => try!(writer.write_str("\\b")),
-            b'\x0c' => try!(writer.write_str("\\f")),
-            b'\n' => try!(writer.write_str("\\n")),
-            b'\r' => try!(writer.write_str("\\r")),
-            b'\t' => try!(writer.write_str("\\t")),
-            _ => try!(writer.write_u8(*byte)),
-        }
-    }
-    writer.write_str("\"")
+pub fn escape_bytes(wr: &mut io::Writer, bytes: &[u8]) -> Result<(), io::IoError> {
+    try!(wr.write_str("\""));
+
+    let mut start = 0;
+
+    for (i, byte) in bytes.iter().enumerate() {
+        let escaped = match *byte {
+            b'"' => "\\\"",
+            b'\\' => "\\\\",
+            b'\x08' => "\\b",
+            b'\x0c' => "\\f",
+            b'\n' => "\\n",
+            b'\r' => "\\r",
+            b'\t' => "\\t",
+            _ => { continue; }
+        };
+
+        if start < i {
+            try!(wr.write(bytes.slice(start, i)));
+        }
+
+        try!(wr.write_str(escaped));
+
+        start = i + 1;
+    }
+
+    if start != bytes.len() {
+        try!(wr.write(bytes.slice_from(start)));
+    }
+
+    wr.write_str("\"")
 }
 
 fn escape_str(writer: &mut io::Writer, v: &str) -> Result<(), io::IoError> {