From eddfb475c6a81c5fe9424cf7fd275cfdb0637212 Mon Sep 17 00:00:00 2001
From: Nikolay Volf <nikvolf@gmail.com>
Date: Wed, 5 Oct 2016 14:37:27 +0300
Subject: [PATCH] get rid of collects

---
 ethstore/src/dir/disk.rs | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/ethstore/src/dir/disk.rs b/ethstore/src/dir/disk.rs
index 3016412eb..e4d3b91c6 100644
--- a/ethstore/src/dir/disk.rs
+++ b/ethstore/src/dir/disk.rs
@@ -76,15 +76,14 @@ impl DiskDirectory {
 			.map(|entry| entry.path())
 			.collect::<Vec<PathBuf>>();
 
-		let files: Result<Vec<_>, _> = paths.iter()
-			.map(fs::File::open)
-			.collect();
-
-		let files = try!(files);
-
-		files.into_iter()
-			.map(json::KeyFile::load)
-			.zip(paths.into_iter())
+		paths
+			.iter()
+			.map(|p| (
+				fs::File::open(p)
+					.map_err(Error::from)
+					.and_then(|r| json::KeyFile::load(r).map_err(|e| Error::Custom(format!("{:?}", e)))),
+				p
+			))
 			.map(|(file, path)| match file {
 				Ok(file) => Ok((path.clone(), SafeAccount::from_file(
 					file, Some(path.file_name().and_then(|n| n.to_str()).expect("Keys have valid UTF8 names only.").to_owned())