Use Iterator::all()

2 files changed, 7 insertions, 13 deletions

diff --git a/src/executor.rs b/src/executor.rs
index 0568cf1..18944cd 100644
--- a/src/executor.rs
+++ b/src/executor.rs
@@ -41,13 +41,10 @@ impl<'a> Executor<'a> {
 	fn deps_satisfied(&self, task: &TaskRef) -> bool {
 		let task_def = self.tasks.get(task).expect("Invalid TaskRef");
 
-		for dep in &task_def.depends {
-			if !self.tasks_done.contains(dep) {
-				return false;
-			}
-		}
-
-		true
+		task_def
+			.depends
+			.iter()
+			.all(|dep| self.tasks_done.contains(dep))
 	}
 
 	fn run_one(&mut self) {
diff --git a/src/resolve.rs b/src/resolve.rs
index 9aa26a6..95b798a 100644
--- a/src/resolve.rs
+++ b/src/resolve.rs
@@ -72,12 +72,9 @@ impl<'a> Resolver<'a> {
 	}
 
 	fn tasks_resolved(&self) -> bool {
-		for (_, resolved) in &self.resolve_state {
-			if *resolved != ResolveState::Resolved {
-				return false;
-			}
-		}
-		true
+		self.resolve_state
+			.values()
+			.all(|resolved| *resolved == ResolveState::Resolved)
 	}
 
 	pub fn add_task(&mut self, task: &TaskRef) -> Vec<Error> {