summaryrefslogtreecommitdiff
path: root/src/dev/check.rs
diff options
context:
space:
mode:
authormo8it <mo8it@proton.me>2024-08-01 19:17:40 +0200
committermo8it <mo8it@proton.me>2024-08-01 19:17:40 +0200
commit3fc462f90fec10cfacd3d81e944b11bb776a2941 (patch)
tree28eddbb8a9ddf05d505bd52d46eeac5a87ac020f /src/dev/check.rs
parent65a8f6bb4b542a24bf80265cf5080b5c8f51fb7e (diff)
Fix tests
Diffstat (limited to 'src/dev/check.rs')
-rw-r--r--src/dev/check.rs17
1 files changed, 7 insertions, 10 deletions
diff --git a/src/dev/check.rs b/src/dev/check.rs
index cf1d976..0b243b2 100644
--- a/src/dev/check.rs
+++ b/src/dev/check.rs
@@ -25,10 +25,13 @@ fn forbidden_char(input: &str) -> Option<char> {
// Check that the Cargo.toml file is up-to-date.
fn check_cargo_toml(
exercise_infos: &[ExerciseInfo],
- current_cargo_toml: &str,
+ cargo_toml_path: &str,
exercise_path_prefix: &[u8],
) -> Result<()> {
- let (bins_start_ind, bins_end_ind) = bins_start_end_ind(current_cargo_toml)?;
+ let current_cargo_toml = fs::read_to_string(cargo_toml_path)
+ .with_context(|| format!("Failed to read the file `{cargo_toml_path}`"))?;
+
+ let (bins_start_ind, bins_end_ind) = bins_start_end_ind(&current_cargo_toml)?;
let old_bins = &current_cargo_toml.as_bytes()[bins_start_ind..bins_end_ind];
let mut new_bins = Vec::with_capacity(BINS_BUFFER_CAPACITY);
@@ -305,15 +308,9 @@ pub fn check(require_solutions: bool) -> Result<()> {
if cfg!(debug_assertions) {
// A hack to make `cargo run -- dev check` work when developing Rustlings.
- check_cargo_toml(
- &info_file.exercises,
- include_str!("../../dev-Cargo.toml"),
- b"../",
- )?;
+ check_cargo_toml(&info_file.exercises, "dev/Cargo.toml", b"../")?;
} else {
- let current_cargo_toml =
- fs::read_to_string("Cargo.toml").context("Failed to read the file `Cargo.toml`")?;
- check_cargo_toml(&info_file.exercises, &current_cargo_toml, b"")?;
+ check_cargo_toml(&info_file.exercises, "Cargo.toml", b"")?;
}
let cmd_runner = CmdRunner::build()?;