1
Fork 0

rollup merge of #20656: japaric/at-clean

This commit is contained in:
Alex Crichton 2015-01-06 15:41:13 -08:00
commit 34a63d3364
5 changed files with 84 additions and 87 deletions

View file

@ -610,8 +610,8 @@ impl<T:Decodable+Send+Sync> Decodable for Arc<T> {
pub trait EncoderHelpers: Encoder {
fn emit_from_vec<T, F>(&mut self, v: &[T], f: F)
-> Result<(), <Self as Encoder>::Error>
where F: FnMut(&mut Self, &T) -> Result<(), <Self as Encoder>::Error>;
-> Result<(), Self::Error>
where F: FnMut(&mut Self, &T) -> Result<(), Self::Error>;
}
impl<S:Encoder> EncoderHelpers for S {
@ -631,8 +631,8 @@ impl<S:Encoder> EncoderHelpers for S {
pub trait DecoderHelpers: Decoder {
fn read_to_vec<T, F>(&mut self, f: F)
-> Result<Vec<T>, <Self as Decoder>::Error> where
F: FnMut(&mut Self) -> Result<T, <Self as Decoder>::Error>;
-> Result<Vec<T>, Self::Error> where
F: FnMut(&mut Self) -> Result<T, Self::Error>;
}
impl<D: Decoder> DecoderHelpers for D {