pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-04-22 18:27:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplify down serde2

Browse Source
This commit is contained in:
Erick Tryzelaar
2014-09-01 14:52:19 -07:00
parent 3fb863475b
commit a624d05afa
4 changed files with 122 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde2/src/json/ser.rs
+28 -61
View File
@@ -65,34 +65,18 @@ impl<W: Writer> ser::VisitorState<io::IoResult<()>> for Serializer<W> {
}
fn visit_seq<
T: ser::Serialize<Serializer<W>, io::IoResult<()>>,
Iter: Iterator<T>
>(&mut self, mut iter: Iter) -> io::IoResult<()> {
try!(write!(self.writer, "["));
let mut first = true;
for elt in iter {
try!(self.visit_seq_elt(first, elt));
first = false;
}
write!(self.writer, "]")
}
fn visit_seq_elt<
T: ser::Serialize<Serializer<W>, io::IoResult<()>>
>(&mut self, first: bool, value: T) -> io::IoResult<()> {
if !first {
try!(write!(self.writer, ", "));
}
value.serialize(self)
}
fn visit_tuple<
V: ser::Visitor<Serializer<W>, io::IoResult<()>>
>(&mut self, mut visitor: V) -> io::IoResult<()> {
try!(write!(self.writer, "["));
let mut first = true;
loop {
if first {
first = false;
} else {
try!(write!(self.writer, ", "));
}
match visitor.visit(self) {
Some(Ok(())) => { }
Some(Err(err)) => { return Err(err); }
@@ -102,29 +86,30 @@ impl<W: Writer> ser::VisitorState<io::IoResult<()>> for Serializer<W> {
write!(self.writer, "]")
}
fn visit_tuple_struct<
V: ser::Visitor<Serializer<W>, io::IoResult<()>>
>(&mut self, _name: &'static str, visitor: V) -> io::IoResult<()> {
self.visit_tuple(visitor)
}
fn visit_enum<
V: ser::Visitor<Serializer<W>, io::IoResult<()>>
>(&mut self, _name: &'static str, _variant: &'static str, visitor: V) -> io::IoResult<()> {
self.visit_tuple(visitor)
fn visit_seq_elt<
T: ser::Serialize<Serializer<W>, io::IoResult<()>>
>(&mut self, value: T) -> io::IoResult<()> {
value.serialize(self)
}
fn visit_map<
K: ser::Serialize<Serializer<W>, io::IoResult<()>>,
V: ser::Serialize<Serializer<W>, io::IoResult<()>>,
Iter: Iterator<(K, V)>
>(&mut self, mut iter: Iter) -> io::IoResult<()> {
V: ser::Visitor<Serializer<W>, io::IoResult<()>>
>(&mut self, mut visitor: V) -> io::IoResult<()> {
try!(write!(self.writer, "{{"));
let mut first = true;
for (key, value) in iter {
try!(self.visit_map_elt(first, &key, &value))
first = false;
loop {
if first {
first = false;
} else {
try!(write!(self.writer, ", "));
}
match visitor.visit(self) {
Some(Ok(())) => { }
Some(Err(err)) => { return Err(err); }
None => { break; }
}
}
write!(self.writer, "}}")
}
@@ -132,29 +117,11 @@ impl<W: Writer> ser::VisitorState<io::IoResult<()>> for Serializer<W> {
fn visit_map_elt<
K: ser::Serialize<Serializer<W>, io::IoResult<()>>,
V: ser::Serialize<Serializer<W>, io::IoResult<()>>
>(&mut self, first: bool, key: K, value: V) -> io::IoResult<()> {
if !first {
try!(write!(self.writer, ", "));
}
>(&mut self, key: K, value: V) -> io::IoResult<()> {
try!(key.serialize(self));
try!(write!(self.writer, ": "));
value.serialize(self)
}
fn visit_struct<
V: ser::Visitor<Serializer<W>, io::IoResult<()>>
>(&mut self, _name: &'static str, mut visitor: V) -> io::IoResult<()> {
try!(write!(self.writer, "{{"));
loop {
match visitor.visit(self) {
Some(Ok(())) => { }
Some(Err(err)) => { return Err(err); }
None => { break; }
}
}
write!(self.writer, "}}")
}
}
pub fn escape_bytes<W: Writer>(wr: &mut W, bytes: &[u8]) -> io::IoResult<()> {