From 9231bc66221626c387b019659c84e1905e3f4f5a Mon Sep 17 00:00:00 2001
From: debris <marek.kotewicz@gmail.com>
Date: Mon, 14 Dec 2015 12:03:48 +0100
Subject: [PATCH] read_list -> as_list

---
 src/rlp/traits.rs        |  5 ++---
 src/rlp/untrusted_rlp.rs | 33 +++++++++++++++------------------
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/src/rlp/traits.rs b/src/rlp/traits.rs
index 4f9ad09e5..067c438bf 100644
--- a/src/rlp/traits.rs
+++ b/src/rlp/traits.rs
@@ -1,11 +1,10 @@
 use rlp::DecoderError;
 
-pub trait Decoder {
+pub trait Decoder: Sized {
 	fn read_value<T, F>(&self, f: F) -> Result<T, DecoderError>
 		where F: FnOnce(&[u8]) -> Result<T, DecoderError>;
 
-	fn read_list<T, F>(&self, f: F) -> Result<T, DecoderError>
-		where F: FnOnce(&[Self]) -> Result<T, DecoderError>;
+	fn as_list(&self) -> Result<Vec<Self>, DecoderError>;
 }
 
 pub trait Decodable: Sized {
diff --git a/src/rlp/untrusted_rlp.rs b/src/rlp/untrusted_rlp.rs
index 90bfef96c..a8cecf09f 100644
--- a/src/rlp/untrusted_rlp.rs
+++ b/src/rlp/untrusted_rlp.rs
@@ -305,13 +305,11 @@ impl<'a> Decoder for BasicDecoder<'a> {
 		}
 	}
 
-	fn read_list<T, F>(&self, f: F) -> Result<T, DecoderError>
-		where F: FnOnce(&[Self]) -> Result<T, DecoderError> {
-
+	fn as_list(&self) -> Result<Vec<Self>, DecoderError> {
 		let v: Vec<BasicDecoder<'a>> = self.rlp.iter()
 			.map(| i | BasicDecoder::new(i))
 			.collect();
-		f(&v)
+		Ok(v)
 	}
 }
 
@@ -325,9 +323,8 @@ impl<T> Decodable for T where T: FromBytes {
 
 impl<T> Decodable for Vec<T> where T: Decodable {
 	fn decode<D>(decoder: &D) -> Result<Self, DecoderError>  where D: Decoder {
-		decoder.read_list(| decoders | {
-			decoders.iter().map(|d| T::decode(d)).collect()
-		})
+		let decoders = try!(decoder.as_list());
+		decoders.iter().map(|d| T::decode(d)).collect()
 	}
 }
 
@@ -357,18 +354,18 @@ macro_rules! impl_array_decodable {
 	($index_type:ty, $len:expr ) => (
 		impl<T> Decodable for [T; $len] where T: Decodable {
 			fn decode<D>(decoder: &D) -> Result<Self, DecoderError>  where D: Decoder {
-				decoder.read_list(| decoders | {
-					let mut result: [T; $len] = unsafe { ::std::mem::uninitialized() };
-					if decoders.len() != $len {
-						return Err(DecoderError::RlpIncorrectListLen);
-					}
-					
-					for i in 0..decoders.len() {
-						result[i] = try!(T::decode(&decoders[i]));
-					}
+				let decoders = try!(decoder.as_list());
 
-					Ok(result)
-				})
+				let mut result: [T; $len] = unsafe { ::std::mem::uninitialized() };
+				if decoders.len() != $len {
+					return Err(DecoderError::RlpIncorrectListLen);
+				}
+				
+				for i in 0..decoders.len() {
+					result[i] = try!(T::decode(&decoders[i]));
+				}
+
+				Ok(result)
 			}
 		}
 	)