summaryrefslogtreecommitdiff
path: root/src/libserialize/serialize.rs
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-01-06 15:41:13 -0800
committerAlex Crichton <alex@alexcrichton.com>2015-01-06 15:41:13 -0800
commit34a63d336419e80d3afec16c730d1ad5fa11dc73 (patch)
tree72d2aab377cb107ed926e7c35a87a5a1f6401b67 /src/libserialize/serialize.rs
parent7840499a7571f467e50895b9cc86627b823c739d (diff)
parentec133fed409d41569485a689fe07c6da035000bd (diff)
downloadrust-34a63d336419e80d3afec16c730d1ad5fa11dc73.tar.gz
rollup merge of #20656: japaric/at-clean
Diffstat (limited to 'src/libserialize/serialize.rs')
-rw-r--r--src/libserialize/serialize.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libserialize/serialize.rs b/src/libserialize/serialize.rs
index edaee31462c..d80a14422e9 100644
--- a/src/libserialize/serialize.rs
+++ b/src/libserialize/serialize.rs
@@ -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 {