Skip to content

Commit

Permalink
Merge pull request rust-lang#1319 from cloppingemu/main
Browse files Browse the repository at this point in the history
fix(verify): progress bar percent now updates with the number of files verified
  • Loading branch information
shadows-withal authored Jan 11, 2023
2 parents 6ef284b + 951826e commit 2b30cec
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions src/verify.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@ pub fn verify<'a>(
progress: (usize, usize),
verbose: bool,
) -> Result<(), &'a Exercise> {
let (num_done, total) = progress;
let (mut num_done, total) = progress;
let bar = ProgressBar::new(total as u64);
bar.set_style(ProgressStyle::default_bar()
.template("Progress: [{bar:60.green/red}] {pos}/{len} {msg}")
.progress_chars("#>-")
);
bar.set_position(num_done as u64);
bar.set_message(format!("({:.1} %)", 0.));

for exercise in exercises {
let compile_result = match exercise.mode {
Mode::Test => compile_and_test(exercise, RunMode::Interactive, verbose),
Expand All @@ -29,9 +31,10 @@ pub fn verify<'a>(
if !compile_result.unwrap_or(false) {
return Err(exercise);
}
num_done += 1;
let percentage = num_done as f32 / total as f32 * 100.0;
bar.set_message(format!("({:.1} %)", percentage));
bar.inc(1);
bar.set_message(format!("({:.1} %)", percentage));
}
Ok(())
}
Expand Down

0 comments on commit 2b30cec

Please sign in to comment.