berkus
/
bincode-orig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix rustc warnings.

This commit is contained in:
crhino 2014-12-15 23:15:19 -08:00
parent 86d7094177
commit 1219fe8cf0
3 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib.rs
View File

@ -21,7 +21,7 @@ mod reader;
pub fn encode<'a, T: Encodable<EncoderWriter<'a, MemWriter>, IoError>>(t: &T) ->IoResult<Vec<u8>> { pub fn encode<'a, T: Encodable<EncoderWriter<'a, MemWriter>, IoError>>(t: &T) ->IoResult<Vec<u8>> {
let mut w = MemWriter::new(); let mut w = MemWriter::new();
match encode_into(t, &mut w) { match encode_into(t, &mut w) {
Ok(()) => Ok(w.unwrap()), Ok(()) => Ok(w.into_inner()),
Err(e) => Err(e) Err(e) => Err(e)
} }
} }

24
src/reader.rs
View File

@ -70,16 +70,16 @@ impl<'a, R: Reader+Buffer> Decoder<IoError> for DecoderReader<'a, R> {
} }
Ok(String::from_utf8(vector).unwrap()) Ok(String::from_utf8(vector).unwrap())
} }
fn read_enum<T, F>(&mut self, name: &str, f: F) -> IoResult<T> where fn read_enum<T, F>(&mut self, _: &str, f: F) -> IoResult<T> where
F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult<T> { F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult<T> {
f(self) f(self)
} }
fn read_enum_variant<T, F>(&mut self, names: &[&str], f: F) -> IoResult<T> where fn read_enum_variant<T, F>(&mut self, _: &[&str], f: F) -> IoResult<T> where
F: FnOnce(&mut DecoderReader<'a, R>, uint) -> IoResult<T> { F: FnOnce(&mut DecoderReader<'a, R>, uint) -> IoResult<T> {
let id = try!(self.read_uint()); let id = try!(self.read_uint());
f(self, id) f(self, id)
} }
fn read_enum_variant_arg<T, F>(&mut self, a_idx: uint, f: F) -> IoResult<T> where fn read_enum_variant_arg<T, F>(&mut self, _: uint, f: F) -> IoResult<T> where
F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult<T> { F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult<T> {
f(self) f(self)
} }
@ -95,27 +95,27 @@ impl<'a, R: Reader+Buffer> Decoder<IoError> for DecoderReader<'a, R> {
F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult<T> { F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult<T> {
self.read_enum_variant_arg(f_idx, f) self.read_enum_variant_arg(f_idx, f)
} }
fn read_struct<T, F>(&mut self, s_name: &str, len: uint, f: F) -> IoResult<T> where fn read_struct<T, F>(&mut self, _: &str, _: uint, f: F) -> IoResult<T> where
F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult<T> { F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult<T> {
f(self) f(self)
} }
fn read_struct_field<T, F>(&mut self, fn read_struct_field<T, F>(&mut self,
f_name: &str, _: &str,
f_idx: uint, _: uint,
f: F) f: F)
-> IoResult<T> where -> IoResult<T> where
F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult<T> { F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult<T> {
f(self) f(self)
} }
fn read_tuple<T, F>(&mut self, len: uint, f: F) -> IoResult<T> where fn read_tuple<T, F>(&mut self, _: uint, f: F) -> IoResult<T> where
F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult<T> { F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult<T> {
f(self) f(self)
} }
fn read_tuple_arg<T, F>(&mut self, a_idx: uint, f: F) -> IoResult<T> where fn read_tuple_arg<T, F>(&mut self, _: uint, f: F) -> IoResult<T> where
F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult<T> { F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult<T> {
f(self) f(self)
} }
fn read_tuple_struct<T, F>(&mut self, s_name: &str, len: uint, f: F) -> IoResult<T> where fn read_tuple_struct<T, F>(&mut self, _: &str, len: uint, f: F) -> IoResult<T> where
F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult<T> { F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult<T> {
self.read_tuple(len, f) self.read_tuple(len, f)
} }
@ -135,7 +135,7 @@ impl<'a, R: Reader+Buffer> Decoder<IoError> for DecoderReader<'a, R> {
let len = try!(self.read_uint()); let len = try!(self.read_uint());
f(self, len) f(self, len)
} }
fn read_seq_elt<T, F>(&mut self, idx: uint, f: F) -> IoResult<T> where fn read_seq_elt<T, F>(&mut self, _: uint, f: F) -> IoResult<T> where
F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult<T> { F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult<T> {
f(self) f(self)
} }
@ -144,11 +144,11 @@ impl<'a, R: Reader+Buffer> Decoder<IoError> for DecoderReader<'a, R> {
let len = try!(self.read_uint()); let len = try!(self.read_uint());
f(self, len) f(self, len)
} }
fn read_map_elt_key<T, F>(&mut self, idx: uint, f: F) -> IoResult<T> where fn read_map_elt_key<T, F>(&mut self, _: uint, f: F) -> IoResult<T> where
F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult<T> { F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult<T> {
f(self) f(self)
} }
fn read_map_elt_val<T, F>(&mut self, idx: uint, f: F) -> IoResult<T> where fn read_map_elt_val<T, F>(&mut self, _: uint, f: F) -> IoResult<T> where
F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult<T> { F: FnOnce(&mut DecoderReader<'a, R>) -> IoResult<T> {
f(self) f(self)
} }

34
src/writer.rs
View File

@ -61,53 +61,53 @@ impl<'a, W: Writer> Encoder<IoError> for EncoderWriter<'a, W> {
try!(self.emit_uint(v.len())); try!(self.emit_uint(v.len()));
self.writer.write_str(v) self.writer.write_str(v)
} }
fn emit_enum<F>(&mut self, name: &str, f: F) -> EwResult where fn emit_enum<F>(&mut self, __: &str, f: F) -> EwResult where
F: FnOnce(&mut EncoderWriter<'a, W>) -> EwResult { F: FnOnce(&mut EncoderWriter<'a, W>) -> EwResult {
f(self) f(self)
} }
fn emit_enum_variant<F>(&mut self, v_name: &str, fn emit_enum_variant<F>(&mut self, _: &str,
v_id: uint, v_id: uint,
len: uint, _: uint,
f: F) -> EwResult where f: F) -> EwResult where
F: FnOnce(&mut EncoderWriter<'a, W>) -> EwResult { F: FnOnce(&mut EncoderWriter<'a, W>) -> EwResult {
try!(self.emit_uint(v_id)); try!(self.emit_uint(v_id));
f(self) f(self)
} }
fn emit_enum_variant_arg<F>(&mut self, a_idx: uint, f: F) -> EwResult where fn emit_enum_variant_arg<F>(&mut self, _: uint, f: F) -> EwResult where
F: FnOnce(&mut EncoderWriter<'a, W>) -> EwResult { F: FnOnce(&mut EncoderWriter<'a, W>) -> EwResult {
f(self) f(self)
} }
fn emit_enum_struct_variant<F>(&mut self, v_name: &str, fn emit_enum_struct_variant<F>(&mut self, _: &str,
v_id: uint, _: uint,
len: uint, _: uint,
f: F) -> EwResult where f: F) -> EwResult where
F: FnOnce(&mut EncoderWriter<'a, W>) -> EwResult { F: FnOnce(&mut EncoderWriter<'a, W>) -> EwResult {
f(self) f(self)
} }
fn emit_enum_struct_variant_field<F>(&mut self, fn emit_enum_struct_variant_field<F>(&mut self,
f_name: &str, _: &str,
f_idx: uint, _: uint,
f: F) -> EwResult where f: F) -> EwResult where
F: FnOnce(&mut EncoderWriter<'a, W>) -> EwResult { F: FnOnce(&mut EncoderWriter<'a, W>) -> EwResult {
f(self) f(self)
} }
fn emit_struct<F>(&mut self, name: &str, len: uint, f: F) -> EwResult where fn emit_struct<F>(&mut self, _: &str, _: uint, f: F) -> EwResult where
F: FnOnce(&mut EncoderWriter<'a, W>) -> EwResult { F: FnOnce(&mut EncoderWriter<'a, W>) -> EwResult {
f(self) f(self)
} }
fn emit_struct_field<F>(&mut self, f_name: &str, f_idx: uint, f: F) -> EwResult where fn emit_struct_field<F>(&mut self, _: &str, _: uint, f: F) -> EwResult where
F: FnOnce(&mut EncoderWriter<'a, W>) -> EwResult { F: FnOnce(&mut EncoderWriter<'a, W>) -> EwResult {
f(self) f(self)
} }
fn emit_tuple<F>(&mut self, len: uint, f: F) -> EwResult where fn emit_tuple<F>(&mut self, _: uint, f: F) -> EwResult where
F: FnOnce(&mut EncoderWriter<'a, W>) -> EwResult { F: FnOnce(&mut EncoderWriter<'a, W>) -> EwResult {
f(self) f(self)
} }
fn emit_tuple_arg<F>(&mut self, idx: uint, f: F) -> EwResult where fn emit_tuple_arg<F>(&mut self, _: uint, f: F) -> EwResult where
F: FnOnce(&mut EncoderWriter<'a, W>) -> EwResult { F: FnOnce(&mut EncoderWriter<'a, W>) -> EwResult {
f(self) f(self)
} }
fn emit_tuple_struct<F>(&mut self, name: &str, len: uint, f: F) -> EwResult where fn emit_tuple_struct<F>(&mut self, _: &str, len: uint, f: F) -> EwResult where
F: FnOnce(&mut EncoderWriter<'a, W>) -> EwResult { F: FnOnce(&mut EncoderWriter<'a, W>) -> EwResult {
self.emit_tuple(len, f) self.emit_tuple(len, f)
} }
@ -132,7 +132,7 @@ impl<'a, W: Writer> Encoder<IoError> for EncoderWriter<'a, W> {
try!(self.emit_uint(len)); try!(self.emit_uint(len));
f(self) f(self)
} }
fn emit_seq_elt<F>(&mut self, idx: uint, f: F) -> EwResult where fn emit_seq_elt<F>(&mut self, _: uint, f: F) -> EwResult where
F: FnOnce(&mut EncoderWriter<'a, W>) -> EwResult { F: FnOnce(&mut EncoderWriter<'a, W>) -> EwResult {
f(self) f(self)
} }
@ -141,11 +141,11 @@ impl<'a, W: Writer> Encoder<IoError> for EncoderWriter<'a, W> {
try!(self.emit_uint(len)); try!(self.emit_uint(len));
f(self) f(self)
} }
fn emit_map_elt_key<F>(&mut self, idx: uint, mut f: F) -> EwResult where fn emit_map_elt_key<F>(&mut self, _: uint, mut f: F) -> EwResult where
F: FnMut(&mut EncoderWriter<'a, W>) -> EwResult { F: FnMut(&mut EncoderWriter<'a, W>) -> EwResult {
f(self) f(self)
} }
fn emit_map_elt_val<F>(&mut self, idx: uint, f: F) -> EwResult where fn emit_map_elt_val<F>(&mut self, _: uint, f: F) -> EwResult where
F: FnOnce(&mut EncoderWriter<'a, W>) -> EwResult { F: FnOnce(&mut EncoderWriter<'a, W>) -> EwResult {
f(self) f(self)
} }