Skip to content
This repository was archived by the owner on Aug 18, 2020. It is now read-only.

Rust nightly rollup (macro + serialize fn bounds) #39

Merged
mneumann merged 2 commits into from
Dec 22, 2014
Merged

Rust nightly rollup (macro + serialize fn bounds) #39

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d45325d
Use `FnMut` where appropriate in the decoder impl...
drbawb Dec 18, 2014
c4dfab2
Macros expanding to items need trailing semicolons
drbawb Dec 19, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,8 +393,8 @@ impl<'a, R: Reader> serialize::Decoder<IoError> for Decoder<R> {
f(self)
}

fn read_enum_variant<T,F>(&mut self, names: &[&str], f: F) -> IoResult<T>
where F: FnOnce(&mut Decoder<R>, uint) -> IoResult<T> {
fn read_enum_variant<T,F>(&mut self, names: &[&str], mut f: F) -> IoResult<T>
where F: FnMut(&mut Decoder<R>, uint) -> IoResult<T> {
let idx = try!(self.read_seq(|d, _len| {
let name = try!(d.read_str());
match names.iter().position(|n| name.as_slice() == *n) {
Expand Down Expand Up @@ -440,8 +440,8 @@ impl<'a, R: Reader> serialize::Decoder<IoError> for Decoder<R> {
f(self)
}

fn read_option<T,F>(&mut self, f: F) -> IoResult<T>
where F: FnOnce(&mut Decoder<R>, bool) -> IoResult<T> {
fn read_option<T,F>(&mut self, mut f: F) -> IoResult<T>
where F: FnMut(&mut Decoder<R>, bool) -> IoResult<T> {
match try!(self._peek_byte()) {
0xc0 => f(self, false),
_ => f(self, true)
Expand All @@ -463,11 +463,11 @@ impl<'a, R: Reader> serialize::Decoder<IoError> for Decoder<R> {

fn read_enum_struct_variant<T,F>(&mut self,
names: &[&str],
f: F) -> IoResult<T>
where F: FnOnce(&mut Decoder<R>, uint) -> IoResult<T> {
f: F) -> IoResult<T>
where F: FnMut(&mut Decoder<R>, uint) -> IoResult<T> {

self.read_enum_variant(names, f)
}
}


fn read_enum_struct_variant_field<T,F>(&mut self,
Expand Down Expand Up @@ -853,7 +853,7 @@ mod test {
assert_eq!($inp, value)
}
);
)
);


#[test]
Expand Down