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

Add --require-solutions option to dev check

Browse source
This commit is contained in:
mo8it 2024-06-02 00:11:41 +02:00
parent 6ae4a979f4
commit 08ac11ff22
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/dev.rs
View file

@ -19,7 +19,11 @@ pub enum DevCommands {
no_git: bool, no_git: bool,
}, },
/// Run checks on the exercises /// Run checks on the exercises
Check, Check {
/// Require that every exercise has a solution
#[arg(short, long)]
require_solutions: bool,
},
/// Update the `Cargo.toml` file for the exercises /// Update the `Cargo.toml` file for the exercises
Update, Update,
} }
@ -34,7 +38,7 @@ impl DevCommands {
new::new(&path, no_git).context(INIT_ERR) new::new(&path, no_git).context(INIT_ERR)
} }
Self::Check => check::check(), Self::Check { require_solutions } => check::check(require_solutions),
Self::Update => update::update(), Self::Update => update::update(),
} }
} }

10
src/dev/check.rs
View file

@ -166,7 +166,7 @@ fn check_exercises(info_file: &InfoFile) -> Result<()> {
Ok(()) Ok(())
} }
fn check_solutions(info_file: &InfoFile) -> Result<()> { fn check_solutions(require_solutions: bool, info_file: &InfoFile) -> Result<()> {
let mut paths = hashbrown::HashSet::with_capacity(info_file.exercises.len()); let mut paths = hashbrown::HashSet::with_capacity(info_file.exercises.len());
let target_dir = parse_target_dir()?; let target_dir = parse_target_dir()?;
let mut output = Vec::with_capacity(OUTPUT_CAPACITY); let mut output = Vec::with_capacity(OUTPUT_CAPACITY);
@ -174,6 +174,10 @@ fn check_solutions(info_file: &InfoFile) -> Result<()> {
for exercise_info in &info_file.exercises { for exercise_info in &info_file.exercises {
let path = exercise_info.sol_path(); let path = exercise_info.sol_path();
if !Path::new(&path).exists() { if !Path::new(&path).exists() {
if require_solutions {
bail!("Exercise {} is missing a solution", exercise_info.name);
}
// No solution to check. // No solution to check.
continue; continue;
} }
@ -197,7 +201,7 @@ fn check_solutions(info_file: &InfoFile) -> Result<()> {
Ok(()) Ok(())
} }
pub fn check() -> Result<()> { pub fn check(require_solutions: bool) -> Result<()> {
let info_file = InfoFile::parse()?; let info_file = InfoFile::parse()?;
// A hack to make `cargo run -- dev check` work when developing Rustlings. // A hack to make `cargo run -- dev check` work when developing Rustlings.
@ -214,7 +218,7 @@ pub fn check() -> Result<()> {
} }
check_exercises(&info_file)?; check_exercises(&info_file)?;
check_solutions(&info_file)?; check_solutions(require_solutions, &info_file)?;
println!("\nEverything looks fine!"); println!("\nEverything looks fine!");