rust/rustlings
1
0
Fork 0
mirror of https://github.com/rust-lang/rustlings.git synced 2025-07-01 00:45:17 +02:00
Code Issues Releases Activity

Run rustfmt on solutions in dev check

Browse Source
This commit is contained in:
mo8it
2024-08-01 19:14:09 +02:00
parent e0f0944bff
commit 65a8f6bb4b
4 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/dev/check.rs
View File

@ -4,6 +4,7 @@ use std::{
fs::{self, read_dir, OpenOptions},
io::{self, Read, Write},
path::{Path, PathBuf},
process::{Command, Stdio},
sync::atomic::{self, AtomicBool},
thread,
};
@ -224,7 +225,7 @@ fn check_solutions(
cmd_runner: &CmdRunner,
) -> Result<()> {
println!("Running all solutions. This may take a while…\n");
let sol_paths = thread::scope(|s| {
thread::scope(|s| {
let handles = info_file
.exercises
.iter()
@ -250,6 +251,14 @@ fn check_solutions(
.collect::<Vec<_>>();
let mut sol_paths = hashbrown::HashSet::with_capacity(info_file.exercises.len());
let mut fmt_cmd = Command::new("rustfmt");
fmt_cmd
.arg("--check")
.arg("--edition")
.arg("2021")
.arg("--color")
.arg("--always")
.stdin(Stdio::null());
for (exercise_name, handle) in info_file
.exercises
@ -259,6 +268,7 @@ fn check_solutions(
{
match handle.join() {
Ok(SolutionCheck::Success { sol_path }) => {
fmt_cmd.arg(&sol_path);
sol_paths.insert(PathBuf::from(sol_path));
}
Ok(SolutionCheck::MissingRequired) => {
@ -276,12 +286,18 @@ fn check_solutions(
}
}
Ok(sol_paths)
})?;
let handle = s.spawn(move || check_unexpected_files("solutions", &sol_paths));
check_unexpected_files("solutions", &sol_paths)?;
if !fmt_cmd
.status()
.context("Failed to run `rustfmt` on all solution files")?
.success()
{
bail!("Some solutions aren't formatted. Run `rustfmt` on them");
}
Ok(())
handle.join().unwrap()
})
}
pub fn check(require_solutions: bool) -> Result<()> {