about summary refs log tree commit diff
path: root/src/libsyntax/parse
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-05-02 20:39:36 -0700
committerbors <bors@rust-lang.org>2013-05-02 20:39:36 -0700
commitb37a685958a99ae37eef4e8bf7e8498ea7b698c1 (patch)
tree0500311b3c436c860a5fe622a9b8e171963d2e07 /src/libsyntax/parse
parentbaa1c1834f608c8c789db6d2495626ff9d28dd96 (diff)
parentdc5df61bc1914224d50d92cdd5599b6337ac68f2 (diff)
downloadrust-b37a685958a99ae37eef4e8bf7e8498ea7b698c1.tar.gz
rust-b37a685958a99ae37eef4e8bf7e8498ea7b698c1.zip
auto merge of #6201 : pcwalton/rust/inhtwama-serializer, r=graydon
This PR removes mutable fields from the serializer and makes the encoder and decoder use INHTWAMA properly (i.e. `&mut self`).

r? @graydon
Diffstat (limited to 'src/libsyntax/parse')
-rw-r--r--src/libsyntax/parse/mod.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs
index 4f1d41a4a7a..0c024958a24 100644
--- a/src/libsyntax/parse/mod.rs
+++ b/src/libsyntax/parse/mod.rs
@@ -420,7 +420,8 @@ mod test {
 
     #[cfg(test)] fn to_json_str<E : Encodable<std::json::Encoder>>(val: @E) -> ~str {
         do io::with_str_writer |writer| {
-            val.encode(~std::json::Encoder(writer));
+            let mut encoder = std::json::Encoder(writer);
+            val.encode(&mut encoder);
         }
     }