diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2013-04-17 18:05:17 -0400 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2013-04-30 06:43:02 -0400 |
| commit | 202b8dcdc420d8b109fbd5260ea2e2be0a5b7faf (patch) | |
| tree | e83d223715ffe4b842f3a46b274b31ee3655ec50 /src/libstd/json.rs | |
| parent | c081ffbd1e845687202a975ea2e698b623e5722f (diff) | |
| download | rust-202b8dcdc420d8b109fbd5260ea2e2be0a5b7faf.tar.gz rust-202b8dcdc420d8b109fbd5260ea2e2be0a5b7faf.zip | |
adapt to snapshot
Diffstat (limited to 'src/libstd/json.rs')
| -rw-r--r-- | src/libstd/json.rs | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/src/libstd/json.rs b/src/libstd/json.rs index 7353bec7333..5d5b0bd952f 100644 --- a/src/libstd/json.rs +++ b/src/libstd/json.rs @@ -143,16 +143,6 @@ impl serialize::Encoder for Encoder { f(); self.wr.write_char('}'); } - #[cfg(stage0)] - fn emit_field(&self, name: &str, idx: uint, f: &fn()) { - if idx != 0 { self.wr.write_char(','); } - self.wr.write_str(escape_str(name)); - self.wr.write_char(':'); - f(); - } - #[cfg(stage1)] - #[cfg(stage2)] - #[cfg(stage3)] fn emit_struct_field(&self, name: &str, idx: uint, f: &fn()) { if idx != 0 { self.wr.write_char(','); } self.wr.write_str(escape_str(name)); @@ -289,21 +279,6 @@ impl serialize::Encoder for PrettyEncoder { self.wr.write_char('}'); } } - #[cfg(stage0)] - fn emit_field(&self, name: &str, idx: uint, f: &fn()) { - if idx == 0 { - self.wr.write_char('\n'); - } else { - self.wr.write_str(",\n"); - } - self.wr.write_str(spaces(self.indent)); - self.wr.write_str(escape_str(name)); - self.wr.write_str(": "); - f(); - } - #[cfg(stage1)] - #[cfg(stage2)] - #[cfg(stage3)] fn emit_struct_field(&self, name: &str, idx: uint, f: &fn()) { if idx == 0 { self.wr.write_char('\n'); @@ -901,29 +876,6 @@ impl serialize::Decoder for Decoder { value } - #[cfg(stage0)] - fn read_field<T>(&self, name: &str, idx: uint, f: &fn() -> T) -> T { - debug!("read_field(name=%?, idx=%u)", name, idx); - match self.stack.pop() { - Object(obj) => { - let mut obj = obj; - let value = match obj.pop(&name.to_owned()) { - None => fail!(fmt!("no such field: %s", name)), - Some(json) => { - self.stack.push(json); - f() - } - }; - self.stack.push(Object(obj)); - value - } - value => fail!(fmt!("not an object: %?", value)) - } - } - - #[cfg(stage1)] - #[cfg(stage2)] - #[cfg(stage3)] fn read_struct_field<T>(&self, name: &str, idx: uint, f: &fn() -> T) -> T { debug!("read_struct_field(name=%?, idx=%u)", name, idx); match self.stack.pop() { |
