From 1219fe8cf01a31bf0d1b753fb5f9bab6b8339a59 Mon Sep 17 00:00:00 2001 From: crhino Date: Mon, 15 Dec 2014 23:15:19 -0800 Subject: [PATCH] Fix rustc warnings. --- src/lib.rs | 2 +- src/reader.rs | 24 ++++++++++++------------ src/writer.rs | 34 +++++++++++++++++----------------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 8107139..ad60f47 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -21,7 +21,7 @@ mod reader; pub fn encode<'a, T: Encodable, IoError>>(t: &T) ->IoResult> { let mut w = MemWriter::new(); match encode_into(t, &mut w) { - Ok(()) => Ok(w.unwrap()), + Ok(()) => Ok(w.into_inner()), Err(e) => Err(e) } } diff --git a/src/reader.rs b/src/reader.rs index 99d4ba3..daa48a2 100644 --- a/src/reader.rs +++ b/src/reader.rs @@ -70,16 +70,16 @@ impl<'a, R: Reader+Buffer> Decoder for DecoderReader<'a, R> { } Ok(String::from_utf8(vector).unwrap()) } - fn read_enum(&mut self, name: &str, f: F) -> IoResult where + fn read_enum(&mut self, _: &str, f: F) -> IoResult where F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult { f(self) } - fn read_enum_variant(&mut self, names: &[&str], f: F) -> IoResult where + fn read_enum_variant(&mut self, _: &[&str], f: F) -> IoResult where F: FnOnce(&mut DecoderReader<'a, R>, uint) -> IoResult { let id = try!(self.read_uint()); f(self, id) } - fn read_enum_variant_arg(&mut self, a_idx: uint, f: F) -> IoResult where + fn read_enum_variant_arg(&mut self, _: uint, f: F) -> IoResult where F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult { f(self) } @@ -95,27 +95,27 @@ impl<'a, R: Reader+Buffer> Decoder for DecoderReader<'a, R> { F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult { self.read_enum_variant_arg(f_idx, f) } - fn read_struct(&mut self, s_name: &str, len: uint, f: F) -> IoResult where + fn read_struct(&mut self, _: &str, _: uint, f: F) -> IoResult where F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult { f(self) } fn read_struct_field(&mut self, - f_name: &str, - f_idx: uint, + _: &str, + _: uint, f: F) -> IoResult where F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult { f(self) } - fn read_tuple(&mut self, len: uint, f: F) -> IoResult where + fn read_tuple(&mut self, _: uint, f: F) -> IoResult where F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult { f(self) } - fn read_tuple_arg(&mut self, a_idx: uint, f: F) -> IoResult where + fn read_tuple_arg(&mut self, _: uint, f: F) -> IoResult where F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult { f(self) } - fn read_tuple_struct(&mut self, s_name: &str, len: uint, f: F) -> IoResult where + fn read_tuple_struct(&mut self, _: &str, len: uint, f: F) -> IoResult where F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult { self.read_tuple(len, f) } @@ -135,7 +135,7 @@ impl<'a, R: Reader+Buffer> Decoder for DecoderReader<'a, R> { let len = try!(self.read_uint()); f(self, len) } - fn read_seq_elt(&mut self, idx: uint, f: F) -> IoResult where + fn read_seq_elt(&mut self, _: uint, f: F) -> IoResult where F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult { f(self) } @@ -144,11 +144,11 @@ impl<'a, R: Reader+Buffer> Decoder for DecoderReader<'a, R> { let len = try!(self.read_uint()); f(self, len) } - fn read_map_elt_key(&mut self, idx: uint, f: F) -> IoResult where + fn read_map_elt_key(&mut self, _: uint, f: F) -> IoResult where F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult { f(self) } - fn read_map_elt_val(&mut self, idx: uint, f: F) -> IoResult where + fn read_map_elt_val(&mut self, _: uint, f: F) -> IoResult where F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult { f(self) } diff --git a/src/writer.rs b/src/writer.rs index 88a518b..7c27ace 100644 --- a/src/writer.rs +++ b/src/writer.rs @@ -61,53 +61,53 @@ impl<'a, W: Writer> Encoder for EncoderWriter<'a, W> { try!(self.emit_uint(v.len())); self.writer.write_str(v) } - fn emit_enum(&mut self, name: &str, f: F) -> EwResult where + fn emit_enum(&mut self, __: &str, f: F) -> EwResult where F: FnOnce(&mut EncoderWriter<'a, W>) -> EwResult { f(self) } - fn emit_enum_variant(&mut self, v_name: &str, + fn emit_enum_variant(&mut self, _: &str, v_id: uint, - len: uint, + _: uint, f: F) -> EwResult where F: FnOnce(&mut EncoderWriter<'a, W>) -> EwResult { try!(self.emit_uint(v_id)); f(self) } - fn emit_enum_variant_arg(&mut self, a_idx: uint, f: F) -> EwResult where + fn emit_enum_variant_arg(&mut self, _: uint, f: F) -> EwResult where F: FnOnce(&mut EncoderWriter<'a, W>) -> EwResult { f(self) } - fn emit_enum_struct_variant(&mut self, v_name: &str, - v_id: uint, - len: uint, + fn emit_enum_struct_variant(&mut self, _: &str, + _: uint, + _: uint, f: F) -> EwResult where F: FnOnce(&mut EncoderWriter<'a, W>) -> EwResult { f(self) } fn emit_enum_struct_variant_field(&mut self, - f_name: &str, - f_idx: uint, + _: &str, + _: uint, f: F) -> EwResult where F: FnOnce(&mut EncoderWriter<'a, W>) -> EwResult { f(self) } - fn emit_struct(&mut self, name: &str, len: uint, f: F) -> EwResult where + fn emit_struct(&mut self, _: &str, _: uint, f: F) -> EwResult where F: FnOnce(&mut EncoderWriter<'a, W>) -> EwResult { f(self) } - fn emit_struct_field(&mut self, f_name: &str, f_idx: uint, f: F) -> EwResult where + fn emit_struct_field(&mut self, _: &str, _: uint, f: F) -> EwResult where F: FnOnce(&mut EncoderWriter<'a, W>) -> EwResult { f(self) } - fn emit_tuple(&mut self, len: uint, f: F) -> EwResult where + fn emit_tuple(&mut self, _: uint, f: F) -> EwResult where F: FnOnce(&mut EncoderWriter<'a, W>) -> EwResult { f(self) } - fn emit_tuple_arg(&mut self, idx: uint, f: F) -> EwResult where + fn emit_tuple_arg(&mut self, _: uint, f: F) -> EwResult where F: FnOnce(&mut EncoderWriter<'a, W>) -> EwResult { f(self) } - fn emit_tuple_struct(&mut self, name: &str, len: uint, f: F) -> EwResult where + fn emit_tuple_struct(&mut self, _: &str, len: uint, f: F) -> EwResult where F: FnOnce(&mut EncoderWriter<'a, W>) -> EwResult { self.emit_tuple(len, f) } @@ -132,7 +132,7 @@ impl<'a, W: Writer> Encoder for EncoderWriter<'a, W> { try!(self.emit_uint(len)); f(self) } - fn emit_seq_elt(&mut self, idx: uint, f: F) -> EwResult where + fn emit_seq_elt(&mut self, _: uint, f: F) -> EwResult where F: FnOnce(&mut EncoderWriter<'a, W>) -> EwResult { f(self) } @@ -141,11 +141,11 @@ impl<'a, W: Writer> Encoder for EncoderWriter<'a, W> { try!(self.emit_uint(len)); f(self) } - fn emit_map_elt_key(&mut self, idx: uint, mut f: F) -> EwResult where + fn emit_map_elt_key(&mut self, _: uint, mut f: F) -> EwResult where F: FnMut(&mut EncoderWriter<'a, W>) -> EwResult { f(self) } - fn emit_map_elt_val(&mut self, idx: uint, f: F) -> EwResult where + fn emit_map_elt_val(&mut self, _: uint, f: F) -> EwResult where F: FnOnce(&mut EncoderWriter<'a, W>) -> EwResult { f(self) }