about summary refs log tree commit diff
path: root/src/libstd/json.rs
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2013-01-14 12:56:31 -0800
committerBrian Anderson <banderson@mozilla.com>2013-01-14 12:56:31 -0800
commitfc582bcfcedc5154b98b45bb5e41eddfcd3a1f74 (patch)
treebd42e7dac410c924c8f22db56536f7ce6f07df1b /src/libstd/json.rs
parent76bcfe8025249c787cba04f2fb035f4915db0a36 (diff)
parent2b6c456bf648e5a7b408b550649d409378e39539 (diff)
downloadrust-fc582bcfcedc5154b98b45bb5e41eddfcd3a1f74.tar.gz
rust-fc582bcfcedc5154b98b45bb5e41eddfcd3a1f74.zip
Merge remote-tracking branch 'mneumann/f-serialize'
Diffstat (limited to 'src/libstd/json.rs')
-rw-r--r--src/libstd/json.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/json.rs b/src/libstd/json.rs
index 9a1d7b4a81e..0dea73981db 100644
--- a/src/libstd/json.rs
+++ b/src/libstd/json.rs
@@ -157,7 +157,7 @@ pub impl Encoder: serialize::Encoder {
         f();
         self.wr.write_char('}');
     }
-    fn emit_struct(&self, _name: &str, f: fn()) {
+    fn emit_struct(&self, _name: &str, _len: uint, f: fn()) {
         self.wr.write_char('{');
         f();
         self.wr.write_char('}');
@@ -270,7 +270,7 @@ pub impl PrettyEncoder: serialize::Encoder {
         self.indent -= 2;
         self.wr.write_char('}');
     }
-    fn emit_struct(&self, _name: &str, f: fn()) {
+    fn emit_struct(&self, _name: &str, _len: uint, f: fn()) {
         self.emit_rec(f)
     }
     fn emit_field(&self, name: &str, idx: uint, f: fn()) {
@@ -870,7 +870,7 @@ pub impl Decoder: serialize::Decoder {
         move value
     }
 
-    fn read_struct<T>(&self, _name: &str, f: fn() -> T) -> T {
+    fn read_struct<T>(&self, _name: &str, _len: uint, f: fn() -> T) -> T {
         debug!("read_struct()");
         let value = f();
         self.pop();