mirror/rustlings
1
0
Fork 0
mirror of https://github.com/rust-lang/rustlings.git synced 2024-12-26 00:00:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update names

Browse source
This commit is contained in:
mo8it 2024-10-14 01:28:12 +02:00
parent ea73af9ba3
commit bdc6dad8de
2 changed files with 33 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/app_state.rs
View file

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

33
src/term.rs
View file

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