ecoppens/colmena
1
0
Fork 0
forked from DGNum/colmena
Code Pull requests Activity

Clippy

Browse source
This commit is contained in:
Zhaofeng Li 2022-06-03 23:51:32 -07:00
parent 7c1e91a09f
commit ed91898e59
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/nix/deployment/mod.rs
View file

@ -211,7 +211,7 @@ impl Deployment {
-> ColmenaResult<()> -> ColmenaResult<()>
{ {
let eval_limit = self.evaluation_node_limit.get_limit() let eval_limit = self.evaluation_node_limit.get_limit()
.unwrap_or_else(|| self.targets.len()); .unwrap_or(self.targets.len());
let mut futures = Vec::new(); let mut futures = Vec::new();
@ -246,7 +246,7 @@ impl Deployment {
let futures = job.run(|job| async move { let futures = job.run(|job| async move {
let mut evaluator = NixEvalJobs::default(); let mut evaluator = NixEvalJobs::default();
let eval_limit = self.evaluation_node_limit.get_limit().unwrap_or_else(|| self.targets.len()); let eval_limit = self.evaluation_node_limit.get_limit().unwrap_or(self.targets.len());
evaluator.set_eval_limit(eval_limit); evaluator.set_eval_limit(eval_limit);
evaluator.set_job(job.clone()); evaluator.set_job(job.clone());

12
src/nix/host/ssh.rs
View file

@ -136,14 +136,10 @@ impl Host for Ssh {
// Wait for node to come back up // Wait for node to come back up
loop { loop {
match self.get_boot_id().await { // Ignore errors while waiting
Ok(new_id) => { if let Ok(new_id) = self.get_boot_id().await {
if new_id != old_id { if new_id != old_id {
break; break;
}
}
Err(_) => {
// Ignore errors while waiting
} }
} }