Skip to content

Commit

Permalink
Auto merge of #6236 - ehuss:fix-fix_path_deps, r=alexcrichton
Browse files Browse the repository at this point in the history
Fix fix_path_deps test error.
  • Loading branch information
bors committed Oct 31, 2018
2 parents d97421c + 52f45b5 commit 56d630f
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions src/cargo/core/compiler/job_queue.rs
Original file line number Diff line number Diff line change
Expand Up @@ -400,18 +400,19 @@ impl<'a> JobQueue<'a> {
let res = job.run(fresh, &JobState { tx: my_tx.clone() });
my_tx.send(Message::Finish(key, res)).unwrap();
};

if !build_plan {
// Print out some nice progress information
self.note_working_on(config, &key, fresh)?;
}

match fresh {
Freshness::Fresh => doit(),
Freshness::Dirty => {
scope.spawn(doit);
}
}

if !build_plan {
// Print out some nice progress information
self.note_working_on(config, &key, fresh)?;
}

Ok(())
}

Expand Down

0 comments on commit 56d630f

Please sign in to comment.