Merge pull request #4 from tedsta/master

Updated to latest rust nightly

examples/file.rs

@@ -11,7 +11,7 @@ fn main() {
 
     let file = File::open_mode(&Path::new("store.bin"), Truncate, ReadWrite);
     let mut file = file.unwrap();
-    bincode::encode_into(&word_counts, &mut file);
+    bincode::encode_into(&word_counts, &mut file).unwrap();
     file.fsync().unwrap();
 
     let out: HashMap<String, uint> =

src/reader.rs

@@ -106,20 +106,19 @@ impl<'a, R: Reader+Buffer> Decoder<IoError> for DecoderReader<'a, R> {
     f: |&mut DecoderReader<'a, R>| -> IoResult<T>) -> IoResult<T> {
         f(self)
     }
-    fn read_tuple<T>(&mut self,
+    fn read_tuple<T>(&mut self, _: uint,
-    f: |&mut DecoderReader<'a, R>, uint| -> IoResult<T>) ->
+    f: |&mut DecoderReader<'a, R>| -> IoResult<T>) ->
     IoResult<T> {
-        let len = try!(self.read_uint());
+        f(self)
-        f(self, len)
     }
     fn read_tuple_arg<T>(&mut self, _: uint,
     f: |&mut DecoderReader<'a, R>| -> IoResult<T>) -> IoResult<T> {
         f(self)
     }
-    fn read_tuple_struct<T>(&mut self, _: &str,
+    fn read_tuple_struct<T>(&mut self, _: &str, len: uint,
-    f: |&mut DecoderReader<'a, R>, uint| -> IoResult<T>) ->
+    f: |&mut DecoderReader<'a, R>| -> IoResult<T>) ->
     IoResult<T> {
-        self.read_tuple(f)
+        self.read_tuple(len, f)
     }
     fn read_tuple_struct_arg<T>(&mut self, a_idx: uint,
     f: |&mut DecoderReader<'a, R>| -> IoResult<T>) -> IoResult<T> {

src/test.rs

@@ -2,7 +2,7 @@ use std::io::MemWriter;
 use std::fmt::Show;
 use std::io::MemReader;
 use std::io::IoError;
-use std::collections::hashmap::HashMap;
+use std::collections::HashMap;
 
 use serialize::{
     Encoder,

src/writer.rs

@@ -93,9 +93,8 @@ impl<'a, W: Writer> Encoder<IoError> for EncoderWriter<'a, W> {
     f: |&mut EncoderWriter<'a, W>| -> EwResult) -> EwResult {
         f(self)
     }
-    fn emit_tuple(&mut self, len: uint,
+    fn emit_tuple(&mut self, _: uint,
     f: |&mut EncoderWriter<'a, W>| -> EwResult) -> EwResult {
-        try!(self.emit_uint(len));
         f(self)
     }
     fn emit_tuple_arg(&mut self, _: uint,