mirror of
https://github.com/rust-lang/rustlings.git
synced 2024-12-26 07:20:30 +00:00
Merge pull request #1404 from nidhalmessaoudi/master
Always showing correct progress percentages.
This commit is contained in:
commit
c8273e06c6
1 changed files with 4 additions and 4 deletions
|
@ -13,14 +13,15 @@ pub fn verify<'a>(
|
|||
progress: (usize, usize),
|
||||
verbose: bool,
|
||||
) -> Result<(), &'a Exercise> {
|
||||
let (mut num_done, total) = progress;
|
||||
let (num_done, total) = progress;
|
||||
let bar = ProgressBar::new(total as u64);
|
||||
let mut percentage = num_done as f32 / total as f32 * 100.0;
|
||||
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.));
|
||||
bar.set_message(format!("({:.1} %)", percentage));
|
||||
|
||||
for exercise in exercises {
|
||||
let compile_result = match exercise.mode {
|
||||
|
@ -31,8 +32,7 @@ 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;
|
||||
percentage += 100.0 / total as f32;
|
||||
bar.inc(1);
|
||||
bar.set_message(format!("({:.1} %)", percentage));
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue