Update names

Author: mo8it

src/app_state.rs

@@ -20,7 +20,7 @@ use crate::{
     embedded::EMBEDDED_FILES,
     exercise::{Exercise, RunnableExercise},
     info_file::ExerciseInfo,
-    term::{self, ExercisesCheckProgressVisualizer},
+    term::{self, CheckProgressVisualizer},
 };
 
 const STATE_FILE_NAME: &str = ".rustlings-state.txt";
@@ -42,7 +42,7 @@ pub enum StateFileStatus {
 }
 
 #[derive(Clone, Copy)]
-pub enum ExerciseCheckProgress {
+pub enum CheckProgress {
     None,
     Checking,
     Done,
@@ -412,10 +412,10 @@ impl AppState {
         let term_width = terminal::size()
             .context("Failed to get the terminal size")?
             .0;
-        let mut progress_visualizer = ExercisesCheckProgressVisualizer::build(stdout, term_width)?;
+        let mut progress_visualizer = CheckProgressVisualizer::build(stdout, term_width)?;
 
         let next_exercise_ind = AtomicUsize::new(0);
-        let mut progresses = vec![ExerciseCheckProgress::None; self.exercises.len()];
+        let mut progresses = vec![CheckProgress::None; self.exercises.len()];
 
         thread::scope(|s| {
             let (exercise_progress_sender, exercise_progress_receiver) = mpsc::channel();
@@ -435,17 +435,17 @@ impl AppState {
                         };
 
                         if exercise_progress_sender
-                            .send((exercise_ind, ExerciseCheckProgress::Checking))
+                            .send((exercise_ind, CheckProgress::Checking))
                             .is_err()
                         {
                             break;
                         };
 
                         let success = exercise.run_exercise(None, &slf.cmd_runner);
                         let progress = match success {
-                            Ok(true) => ExerciseCheckProgress::Done,
-                            Ok(false) => ExerciseCheckProgress::Pending,
-                            Err(_) => ExerciseCheckProgress::None,
+                            Ok(true) => CheckProgress::Done,
+                            Ok(false) => CheckProgress::Pending,
+                            Err(_) => CheckProgress::None,
                         };
 
                         if exercise_progress_sender
@@ -472,34 +472,33 @@ impl AppState {
         let mut first_pending_exercise_ind = None;
         for exercise_ind in 0..progresses.len() {
             match progresses[exercise_ind] {
-                ExerciseCheckProgress::Done => {
+                CheckProgress::Done => {
                     self.set_status(exercise_ind, true)?;
                 }
-                ExerciseCheckProgress::Pending => {
+                CheckProgress::Pending => {
                     self.set_status(exercise_ind, false)?;
                     if first_pending_exercise_ind.is_none() {
                         first_pending_exercise_ind = Some(exercise_ind);
                     }
                 }
-                ExerciseCheckProgress::None | ExerciseCheckProgress::Checking => {
+                CheckProgress::None | CheckProgress::Checking => {
                     // If we got an error while checking all exercises in parallel,
                     // it could be because we exceeded the limit of open file descriptors.
                     // Therefore, try running exercises with errors sequentially.
-                    progresses[exercise_ind] = ExerciseCheckProgress::Checking;
+                    progresses[exercise_ind] = CheckProgress::Checking;
                     progress_visualizer.update(&progresses)?;
 
                     let exercise = &self.exercises[exercise_ind];
                     let success = exercise.run_exercise(None, &self.cmd_runner)?;
                     if success {
-                        progresses[exercise_ind] = ExerciseCheckProgress::Done;
+                        progresses[exercise_ind] = CheckProgress::Done;
                     } else {
+                        progresses[exercise_ind] = CheckProgress::Pending;
                         if first_pending_exercise_ind.is_none() {
                             first_pending_exercise_ind = Some(exercise_ind);
                         }
-                        progresses[exercise_ind] = ExerciseCheckProgress::Pending;
                     }
                     self.set_status(exercise_ind, success)?;
-
                     progress_visualizer.update(&progresses)?;
                 }
             }

src/term.rs

@@ -9,7 +9,7 @@ use std::{
     io::{self, BufRead, StdoutLock, Write},
 };
 
-use crate::app_state::ExerciseCheckProgress;
+use crate::app_state::CheckProgress;
 
 pub struct MaxLenWriter<'a, 'b> {
     pub stdout: &'a mut StdoutLock<'b>,
@@ -87,27 +87,31 @@ impl<'a> CountedWrite<'a> for StdoutLock<'a> {
     }
 }
 
-pub struct ExercisesCheckProgressVisualizer<'a, 'b> {
+pub struct CheckProgressVisualizer<'a, 'b> {
     stdout: &'a mut StdoutLock<'b>,
     n_cols: usize,
 }
 
-impl<'a, 'b> ExercisesCheckProgressVisualizer<'a, 'b> {
+impl<'a, 'b> CheckProgressVisualizer<'a, 'b> {
+    const CHECKING_COLOR: Color = Color::Blue;
+    const DONE_COLOR: Color = Color::Green;
+    const PENDING_COLOR: Color = Color::Red;
+
     pub fn build(stdout: &'a mut StdoutLock<'b>, term_width: u16) -> io::Result<Self> {
         clear_terminal(stdout)?;
         stdout.write_all("Checking all exercises…\n".as_bytes())?;
 
         // Legend
         stdout.write_all(b"Color of exercise number: ")?;
-        stdout.queue(SetForegroundColor(Color::Blue))?;
+        stdout.queue(SetForegroundColor(Self::CHECKING_COLOR))?;
         stdout.write_all(b"Checking")?;
         stdout.queue(ResetColor)?;
         stdout.write_all(b" - ")?;
-        stdout.queue(SetForegroundColor(Color::Green))?;
+        stdout.queue(SetForegroundColor(Self::DONE_COLOR))?;
         stdout.write_all(b"Done")?;
         stdout.queue(ResetColor)?;
         stdout.write_all(b" - ")?;
-        stdout.queue(SetForegroundColor(Color::Red))?;
+        stdout.queue(SetForegroundColor(Self::PENDING_COLOR))?;
         stdout.write_all(b"Pending")?;
         stdout.queue(ResetColor)?;
         stdout.write_all(b"\n")?;
@@ -119,21 +123,22 @@ impl<'a, 'b> ExercisesCheckProgressVisualizer<'a, 'b> {
         Ok(Self { stdout, n_cols })
     }
 
-    pub fn update(&mut self, progresses: &[ExerciseCheckProgress]) -> io::Result<()> {
+    pub fn update(&mut self, progresses: &[CheckProgress]) -> io::Result<()> {
         self.stdout.queue(MoveTo(0, 2))?;
 
         let mut exercise_num = 1;
         for exercise_progress in progresses {
             match exercise_progress {
-                ExerciseCheckProgress::None => (),
-                ExerciseCheckProgress::Checking => {
-                    self.stdout.queue(SetForegroundColor(Color::Blue))?;
+                CheckProgress::None => (),
+                CheckProgress::Checking => {
+                    self.stdout
+                        .queue(SetForegroundColor(Self::CHECKING_COLOR))?;
                 }
-                ExerciseCheckProgress::Done => {
-                    self.stdout.queue(SetForegroundColor(Color::Green))?;
+                CheckProgress::Done => {
+                    self.stdout.queue(SetForegroundColor(Self::DONE_COLOR))?;
                 }
-                ExerciseCheckProgress::Pending => {
-                    self.stdout.queue(SetForegroundColor(Color::Red))?;
+                CheckProgress::Pending => {
+                    self.stdout.queue(SetForegroundColor(Self::PENDING_COLOR))?;
                 }
             }