itsscb/serde
1
0
Fork 0
mirror of https://github.com/serde-rs/serde.git synced 2025-10-02 15:25:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

undo commenting out writing json control characters

Browse Source
This commit is contained in:
Erick Tryzelaar 2014-07-09 11:41:47 -07:00
parent 3a518887b5
commit 839da08e24
1 changed files with 42 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
json.rs
View File

@ -736,7 +736,7 @@ fn io_error_to_error(io: io::IoError) -> ParserError {
pub type EncodeResult = io::IoResult<()>; pub type EncodeResult = io::IoResult<()>;
pub fn escape_bytes<W: Writer>(wr: &mut W, bytes: &[u8]) -> IoResult<()> { pub fn escape_bytes<W: Writer>(wr: &mut W, bytes: &[u8]) -> IoResult<()> {
//try!(wr.write_str("\"")); try!(wr.write_str("\""));
let mut start = 0; let mut start = 0;
@ -765,8 +765,7 @@ pub fn escape_bytes<W: Writer>(wr: &mut W, bytes: &[u8]) -> IoResult<()> {
try!(wr.write(bytes.slice_from(start))); try!(wr.write(bytes.slice_from(start)));
} }
//wr.write_str("\"") wr.write_str("\"")
Ok(())
} }
pub fn escape_str<W: Writer>(wr: &mut W, v: &str) -> IoResult<()> { pub fn escape_str<W: Writer>(wr: &mut W, v: &str) -> IoResult<()> {
@ -922,80 +921,74 @@ impl<W: Writer> ser::Serializer<io::IoError> for Serializer<W> {
#[inline] #[inline]
fn serialize_tuple_start(&mut self, _len: uint) -> IoResult<()> { fn serialize_tuple_start(&mut self, _len: uint) -> IoResult<()> {
self.first = true; self.first = true;
//self.wr.write_str("[") self.wr.write_str("[")
Ok(())
} }
#[inline] #[inline]
fn serialize_tuple_sep< fn serialize_tuple_sep<
T: Serializable T: Serializable
>(&mut self, value: &T) -> IoResult<()> { >(&mut self, value: &T) -> IoResult<()> {
//if self.first { if self.first {
// self.first = false; self.first = false;
//} else { } else {
// try!(self.wr.write_str(",")); try!(self.wr.write_str(","));
//} }
value.serialize(self) value.serialize(self)
} }
#[inline] #[inline]
fn serialize_tuple_end(&mut self) -> IoResult<()> { fn serialize_tuple_end(&mut self) -> IoResult<()> {
//self.wr.write_str("]") self.wr.write_str("]")
Ok(())
} }
#[inline] #[inline]
fn serialize_struct_start(&mut self, _name: &str, _len: uint) -> IoResult<()> { fn serialize_struct_start(&mut self, _name: &str, _len: uint) -> IoResult<()> {
self.first = true; self.first = true;
//self.wr.write_str("{") self.wr.write_str("{")
Ok(())
} }
#[inline] #[inline]
fn serialize_struct_sep< fn serialize_struct_sep<
T: Serializable T: Serializable
>(&mut self, name: &str, value: &T) -> IoResult<()> { >(&mut self, name: &str, value: &T) -> IoResult<()> {
//if self.first { if self.first {
// self.first = false; self.first = false;
//} else { } else {
// try!(self.wr.write_str(",")); try!(self.wr.write_str(","));
//} }
try!(name.serialize(self)); try!(name.serialize(self));
//try!(self.wr.write_str(":")); try!(self.wr.write_str(":"));
value.serialize(self) value.serialize(self)
} }
#[inline] #[inline]
fn serialize_struct_end(&mut self) -> IoResult<()> { fn serialize_struct_end(&mut self) -> IoResult<()> {
//self.wr.write_str("}") self.wr.write_str("}")
Ok(())
} }
#[inline] #[inline]
fn serialize_enum_start(&mut self, _name: &str, variant: &str, _len: uint) -> IoResult<()> { fn serialize_enum_start(&mut self, _name: &str, variant: &str, _len: uint) -> IoResult<()> {
self.first = true; self.first = true;
//try!(self.wr.write_str("{")); try!(self.wr.write_str("{"));
try!(self.serialize_str(variant)); try!(self.serialize_str(variant));
//self.wr.write_str(":[") self.wr.write_str(":[")
Ok(())
} }
#[inline] #[inline]
fn serialize_enum_sep< fn serialize_enum_sep<
T: Serializable T: Serializable
>(&mut self, value: &T) -> IoResult<()> { >(&mut self, value: &T) -> IoResult<()> {
//if self.first { if self.first {
// self.first = false; self.first = false;
//} else { } else {
// try!(self.wr.write_str(",")); try!(self.wr.write_str(","));
//} }
value.serialize(self) value.serialize(self)
} }
#[inline] #[inline]
fn serialize_enum_end(&mut self) -> IoResult<()> { fn serialize_enum_end(&mut self) -> IoResult<()> {
//self.wr.write_str("]}") self.wr.write_str("]}")
Ok(())
} }
#[inline] #[inline]
@ -1017,19 +1010,18 @@ impl<W: Writer> ser::Serializer<io::IoError> for Serializer<W> {
T: Serializable, T: Serializable,
Iter: Iterator<T> Iter: Iterator<T>
>(&mut self, mut iter: Iter) -> IoResult<()> { >(&mut self, mut iter: Iter) -> IoResult<()> {
//try!(self.wr.write_str("[")); try!(self.wr.write_str("["));
//let mut first = true; let mut first = true;
for elt in iter { for elt in iter {
//if first { if first {
// first = false; first = false;
//} else { } else {
// try!(self.wr.write_str(",")); try!(self.wr.write_str(","));
//} }
try!(elt.serialize(self)); try!(elt.serialize(self));
} }
//self.wr.write_str("]") self.wr.write_str("]")
Ok(())
} }
#[inline] #[inline]
@ -1038,21 +1030,20 @@ impl<W: Writer> ser::Serializer<io::IoError> for Serializer<W> {
V: Serializable, V: Serializable,
Iter: Iterator<(K, V)> Iter: Iterator<(K, V)>
>(&mut self, mut iter: Iter) -> IoResult<()> { >(&mut self, mut iter: Iter) -> IoResult<()> {
//try!(self.wr.write_str("{")); try!(self.wr.write_str("{"));
//let mut first = true; let mut first = true;
for (key, value) in iter { for (key, value) in iter {
//if first { if first {
// first = false; first = false;
//} else { } else {
// try!(self.wr.write_str(",")); try!(self.wr.write_str(","));
//} }
try!(key.serialize(self)); try!(key.serialize(self));
//try!(self.wr.write_str(":")); try!(self.wr.write_str(":"));
try!(value.serialize(self)); try!(value.serialize(self));
} }
//self.wr.write_str("}") self.wr.write_str("}")
Ok(())
} }
} }