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

Leak info_file and cmd_runner in dev check

Browse source
This commit is contained in:
mo8it 2024-08-20 14:47:08 +02:00
parent 8854f0a5ed
commit 50f6e5232e
1 changed files with 126 additions and 123 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/dev/check.rs
View file

@ -165,11 +165,13 @@ fn check_unexpected_files(dir: &str, allowed_rust_files: &HashSet<PathBuf>) -> R
Ok(()) Ok(())
} }
fn check_exercises_unsolved(info_file: &InfoFile, cmd_runner: &CmdRunner) -> Result<()> { fn check_exercises_unsolved(
info_file: &'static InfoFile,
cmd_runner: &'static CmdRunner,
) -> Result<()> {
let mut stdout = io::stdout().lock(); let mut stdout = io::stdout().lock();
stdout.write_all(b"Running all exercises to check that they aren't already solved...\n")?; stdout.write_all(b"Running all exercises to check that they aren't already solved...\n")?;
thread::scope(|s| {
let handles = info_file let handles = info_file
.exercises .exercises
.iter() .iter()
@ -180,7 +182,7 @@ fn check_exercises_unsolved(info_file: &InfoFile, cmd_runner: &CmdRunner) -> Res
Some(( Some((
exercise_info.name.as_str(), exercise_info.name.as_str(),
s.spawn(|| exercise_info.run_exercise(None, cmd_runner)), thread::spawn(|| exercise_info.run_exercise(None, cmd_runner)),
)) ))
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
@ -196,9 +198,9 @@ fn check_exercises_unsolved(info_file: &InfoFile, cmd_runner: &CmdRunner) -> Res
}; };
match result { match result {
Ok(true) => bail!( Ok(true) => {
"The exercise {exercise_name} is already solved.\n{SKIP_CHECK_UNSOLVED_HINT}", bail!("The exercise {exercise_name} is already solved.\n{SKIP_CHECK_UNSOLVED_HINT}",)
), }
Ok(false) => (), Ok(false) => (),
Err(e) => return Err(e), Err(e) => return Err(e),
} }
@ -210,20 +212,20 @@ fn check_exercises_unsolved(info_file: &InfoFile, cmd_runner: &CmdRunner) -> Res
stdout.write_all(b"\n")?; stdout.write_all(b"\n")?;
Ok(()) Ok(())
})
} }
fn check_exercises(info_file: &InfoFile, cmd_runner: &CmdRunner) -> Result<()> { fn check_exercises(info_file: &'static InfoFile, cmd_runner: &'static CmdRunner) -> Result<()> {
match info_file.format_version.cmp(&CURRENT_FORMAT_VERSION) { match info_file.format_version.cmp(&CURRENT_FORMAT_VERSION) {
Ordering::Less => bail!("`format_version` < {CURRENT_FORMAT_VERSION} (supported version)\nPlease migrate to the latest format version"), Ordering::Less => bail!("`format_version` < {CURRENT_FORMAT_VERSION} (supported version)\nPlease migrate to the latest format version"),
Ordering::Greater => bail!("`format_version` > {CURRENT_FORMAT_VERSION} (supported version)\nTry updating the Rustlings program"), Ordering::Greater => bail!("`format_version` > {CURRENT_FORMAT_VERSION} (supported version)\nTry updating the Rustlings program"),
Ordering::Equal => (), Ordering::Equal => (),
} }
let info_file_paths = check_info_file_exercises(info_file)?; let handle = thread::spawn(move || check_exercises_unsolved(info_file, cmd_runner));
let handle = thread::spawn(move || check_unexpected_files("exercises", &info_file_paths));
let info_file_paths = check_info_file_exercises(info_file)?;
check_unexpected_files("exercises", &info_file_paths)?;
check_exercises_unsolved(info_file, cmd_runner)?;
handle.join().unwrap() handle.join().unwrap()
} }
@ -236,18 +238,17 @@ enum SolutionCheck {
fn check_solutions( fn check_solutions(
require_solutions: bool, require_solutions: bool,
info_file: &InfoFile, info_file: &'static InfoFile,
cmd_runner: &CmdRunner, cmd_runner: &'static CmdRunner,
) -> Result<()> { ) -> Result<()> {
let mut stdout = io::stdout().lock(); let mut stdout = io::stdout().lock();
stdout.write_all(b"Running all solutions...\n")?; stdout.write_all(b"Running all solutions...\n")?;
thread::scope(|s| {
let handles = info_file let handles = info_file
.exercises .exercises
.iter() .iter()
.map(|exercise_info| { .map(|exercise_info| {
s.spawn(|| { thread::spawn(move || {
let sol_path = exercise_info.sol_path(); let sol_path = exercise_info.sol_path();
if !Path::new(&sol_path).exists() { if !Path::new(&sol_path).exists() {
if require_solutions { if require_solutions {
@ -316,7 +317,7 @@ fn check_solutions(
} }
stdout.write_all(b"\n")?; stdout.write_all(b"\n")?;
let handle = s.spawn(move || check_unexpected_files("solutions", &sol_paths)); let handle = thread::spawn(move || check_unexpected_files("solutions", &sol_paths));
if !fmt_cmd if !fmt_cmd
.status() .status()
@ -327,7 +328,6 @@ fn check_solutions(
} }
handle.join().unwrap() handle.join().unwrap()
})
} }
pub fn check(require_solutions: bool) -> Result<()> { pub fn check(require_solutions: bool) -> Result<()> {
@ -340,9 +340,12 @@ pub fn check(require_solutions: bool) -> Result<()> {
check_cargo_toml(&info_file.exercises, "Cargo.toml", b"")?; check_cargo_toml(&info_file.exercises, "Cargo.toml", b"")?;
} }
let cmd_runner = CmdRunner::build()?; // Leaking is fine since they are used until the end of the program.
check_exercises(&info_file, &cmd_runner)?; let cmd_runner = Box::leak(Box::new(CmdRunner::build()?));
check_solutions(require_solutions, &info_file, &cmd_runner)?; let info_file = Box::leak(Box::new(info_file));
check_exercises(info_file, cmd_runner)?;
check_solutions(require_solutions, info_file, cmd_runner)?;
println!("Everything looks fine!"); println!("Everything looks fine!");