diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2021-10-16 14:46:02 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2021-10-18 21:05:26 +0200 |
| commit | 796523b959de0174de268a715ead148727e93bf4 (patch) | |
| tree | faa912fc3037a313be5ddd27be17d5a1500ee9f2 | |
| parent | 84c69faf6cee6a565f16fd82e0b1b6bcfc6ed1ff (diff) | |
| download | rebel-796523b959de0174de268a715ead148727e93bf4.tar rebel-796523b959de0174de268a715ead148727e93bf4.zip | |
executor: use into_iter() instead of iter() in task_deps()
| -rw-r--r-- | src/executor.rs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/executor.rs b/src/executor.rs index e6fbccd..5dec81d 100644 --- a/src/executor.rs +++ b/src/executor.rs @@ -79,9 +79,8 @@ impl<'ctx> Executor<'ctx> { } fn task_deps(&self, task: &TaskRef<'ctx>) -> Result<HashMap<DependencyHash, Dependency>> { - let fetch_deps = self.fetch_deps(task)?; - - Ok(fetch_deps + Ok(self + .fetch_deps(task)? .into_iter() .chain( resolve::runtime_depends( @@ -91,7 +90,7 @@ impl<'ctx> Executor<'ctx> { .with_context(|| format!("invalid build depends for {}", task))?, ) .expect("invalid runtime depends of build_depends") - .iter() + .into_iter() .filter_map(|dep| self.tasks_done[&dep.task].outputs.get(dep.output)) .map(|&output| Dependency::Task { output, @@ -106,7 +105,7 @@ impl<'ctx> Executor<'ctx> { .with_context(|| format!("invalid depends for {}", task))?, ) .expect("invalid runtime depends of host_depends") - .iter() + .into_iter() .filter_map(|dep| self.tasks_done[&dep.task].outputs.get(dep.output)) .map(|&output| Dependency::Task { output, |