mirror of
https://github.com/rust-lang/rustlings.git
synced 2024-12-29 00:00:04 +03:00
feat: added next up message with the path of next exercise
Added a new property to Exercise, next_path. I populate this property, when loading the exercises.
This commit is contained in:
parent
88b583f2bb
commit
acf135620b
|
@ -54,6 +54,8 @@ pub struct Exercise {
|
||||||
pub mode: Mode,
|
pub mode: Mode,
|
||||||
// The hint text associated with the exercise
|
// The hint text associated with the exercise
|
||||||
pub hint: String,
|
pub hint: String,
|
||||||
|
// The path of the next exercise
|
||||||
|
pub next_path: Option<PathBuf>
|
||||||
}
|
}
|
||||||
|
|
||||||
// An enum to track of the state of an Exercise.
|
// An enum to track of the state of an Exercise.
|
||||||
|
|
20
src/main.rs
20
src/main.rs
|
@ -9,7 +9,7 @@ use notify_debouncer_mini::{new_debouncer, DebouncedEventKind};
|
||||||
use std::ffi::OsStr;
|
use std::ffi::OsStr;
|
||||||
use std::fs;
|
use std::fs;
|
||||||
use std::io::{self, prelude::*};
|
use std::io::{self, prelude::*};
|
||||||
use std::path::Path;
|
use std::path::{Path, PathBuf};
|
||||||
use std::process::{Command, Stdio};
|
use std::process::{Command, Stdio};
|
||||||
use std::sync::atomic::{AtomicBool, Ordering};
|
use std::sync::atomic::{AtomicBool, Ordering};
|
||||||
use std::sync::mpsc::{channel, RecvTimeoutError};
|
use std::sync::mpsc::{channel, RecvTimeoutError};
|
||||||
|
@ -108,9 +108,11 @@ fn main() {
|
||||||
}
|
}
|
||||||
|
|
||||||
let toml_str = &fs::read_to_string("info.toml").unwrap();
|
let toml_str = &fs::read_to_string("info.toml").unwrap();
|
||||||
let exercises = toml::from_str::<ExerciseList>(toml_str).unwrap().exercises;
|
let mut exercises = toml::from_str::<ExerciseList>(toml_str).unwrap().exercises;
|
||||||
let verbose = args.nocapture;
|
let verbose = args.nocapture;
|
||||||
|
|
||||||
|
edit_exercises(&mut exercises);
|
||||||
|
|
||||||
let command = args.command.unwrap_or_else(|| {
|
let command = args.command.unwrap_or_else(|| {
|
||||||
println!("{DEFAULT_OUT}\n");
|
println!("{DEFAULT_OUT}\n");
|
||||||
std::process::exit(0);
|
std::process::exit(0);
|
||||||
|
@ -245,6 +247,20 @@ fn main() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn edit_exercises(exercises: &mut Vec<Exercise>){
|
||||||
|
let siz = exercises.len();
|
||||||
|
for i in 0.. siz {
|
||||||
|
if i == siz - 1 {
|
||||||
|
exercises[i].next_path = None;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
let next_path = &exercises[i + 1].path;
|
||||||
|
let mut x = PathBuf::new();
|
||||||
|
x.push(next_path);
|
||||||
|
exercises[i].next_path = Some(x);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fn spawn_watch_shell(
|
fn spawn_watch_shell(
|
||||||
failed_exercise_hint: &Arc<Mutex<Option<String>>>,
|
failed_exercise_hint: &Arc<Mutex<Option<String>>>,
|
||||||
should_quit: Arc<AtomicBool>,
|
should_quit: Arc<AtomicBool>,
|
||||||
|
|
|
@ -171,6 +171,13 @@ fn prompt_for_completion(
|
||||||
|
|
||||||
let no_emoji = env::var("NO_EMOJI").is_ok();
|
let no_emoji = env::var("NO_EMOJI").is_ok();
|
||||||
|
|
||||||
|
match &exercise.next_path {
|
||||||
|
Some(path) => {
|
||||||
|
println!("Next up: {:?}", path);
|
||||||
|
}
|
||||||
|
None => {}
|
||||||
|
}
|
||||||
|
|
||||||
let clippy_success_msg = if no_emoji {
|
let clippy_success_msg = if no_emoji {
|
||||||
"The code is compiling, and Clippy is happy!"
|
"The code is compiling, and Clippy is happy!"
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in a new issue