From 7880cf6a2efa449bb4088283eafff86702afa749 Mon Sep 17 00:00:00 2001 From: Elizabeth Dempster Date: Mon, 14 Oct 2024 15:09:58 +0100 Subject: [PATCH 1/2] To fix issue #354 --- conjure_oxide/build.rs | 113 ++++++++++++++++++++++++++++------------- 1 file changed, 78 insertions(+), 35 deletions(-) diff --git a/conjure_oxide/build.rs b/conjure_oxide/build.rs index d94dd54010..9c4aa09a46 100644 --- a/conjure_oxide/build.rs +++ b/conjure_oxide/build.rs @@ -1,3 +1,4 @@ + use std::env::var; use std::fs::{read_dir, File}; use std::io::{self, Write}; @@ -18,46 +19,88 @@ fn main() -> io::Result<()> { for subdir in WalkDir::new(test_dir) { let subdir = subdir?; if subdir.file_type().is_dir() { - let stems: Vec = read_dir(subdir.path())? - .filter_map(Result::ok) - .filter(|entry| { - entry - .path() - .extension() - .map_or(false, |ext| ext == "essence" || ext == "eprime") - }) - .filter_map(|entry| { - entry - .path() - .file_stem() - .and_then(|stem| stem.to_str()) - .map(|s| s.to_owned()) - }) - .collect(); + if std::env::var("ALLTEST").is_ok(){ + let stems: Vec = read_dir(subdir.path())? + .filter_map(Result::ok) + .filter(|entry| { + entry + .path() + .extension() + .map_or(false, |ext| ext == "essence" || ext == "eprime" || ext == "disabled") + }) + .filter_map(|entry| { + entry + .path() + .file_stem() + .and_then(|stem| stem.to_str()) + .map(|s| s.to_owned()) + }) + .collect(); + + let exts: Vec = read_dir(subdir.path())? + .filter_map(Result::ok) + .filter(|entry| { + entry + .path() + .extension() + .map_or(false, |ext| ext == "essence" || ext == "eprime" || ext == "disabled") + }) + .filter_map(|entry| { + entry + .path() + .extension() + .and_then(|ext| ext.to_str()) + .map(|s| s.to_owned()) + }) + .collect(); + + let essence_files = std::iter::zip(stems, exts).collect(); - let exts: Vec = read_dir(subdir.path())? - .filter_map(Result::ok) - .filter(|entry| { - entry - .path() - .extension() - .map_or(false, |ext| ext == "essence" || ext == "eprime") - }) - .filter_map(|entry| { - entry - .path() - .extension() - .and_then(|ext| ext.to_str()) - .map(|s| s.to_owned()) - }) - .collect(); + write_test(&mut f, subdir.path().display().to_string(), essence_files)?; + } - let essence_files = std::iter::zip(stems, exts).collect(); + else { + let stems: Vec = read_dir(subdir.path())? + .filter_map(Result::ok) + .filter(|entry| { + entry + .path() + .extension() + .map_or(false, |ext| ext == "essence" || ext == "eprime") + }) + .filter_map(|entry| { + entry + .path() + .file_stem() + .and_then(|stem| stem.to_str()) + .map(|s| s.to_owned()) + }) + .collect(); - write_test(&mut f, subdir.path().display().to_string(), essence_files)?; + let exts: Vec = read_dir(subdir.path())? + .filter_map(Result::ok) + .filter(|entry| { + entry + .path() + .extension() + .map_or(false, |ext| ext == "essence" || ext == "eprime") + }) + .filter_map(|entry| { + entry + .path() + .extension() + .and_then(|ext| ext.to_str()) + .map(|s| s.to_owned()) + }) + .collect(); + + let essence_files = std::iter::zip(stems, exts).collect(); + + write_test(&mut f, subdir.path().display().to_string(), essence_files)?; + } } } - + Ok(()) } From 199a0e4c679befcc340cc612e1253db9dbd402fb Mon Sep 17 00:00:00 2001 From: Elizabeth Dempster Date: Mon, 14 Oct 2024 15:54:13 +0100 Subject: [PATCH 2/2] corrected formatting --- conjure_oxide/build.rs | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/conjure_oxide/build.rs b/conjure_oxide/build.rs index 9c4aa09a46..7566f1ae53 100644 --- a/conjure_oxide/build.rs +++ b/conjure_oxide/build.rs @@ -1,4 +1,3 @@ - use std::env::var; use std::fs::{read_dir, File}; use std::io::{self, Write}; @@ -19,14 +18,13 @@ fn main() -> io::Result<()> { for subdir in WalkDir::new(test_dir) { let subdir = subdir?; if subdir.file_type().is_dir() { - if std::env::var("ALLTEST").is_ok(){ + if std::env::var("ALLTEST").is_ok() { let stems: Vec = read_dir(subdir.path())? .filter_map(Result::ok) .filter(|entry| { - entry - .path() - .extension() - .map_or(false, |ext| ext == "essence" || ext == "eprime" || ext == "disabled") + entry.path().extension().map_or(false, |ext| { + ext == "essence" || ext == "eprime" || ext == "disabled" + }) }) .filter_map(|entry| { entry @@ -40,10 +38,9 @@ fn main() -> io::Result<()> { let exts: Vec = read_dir(subdir.path())? .filter_map(Result::ok) .filter(|entry| { - entry - .path() - .extension() - .map_or(false, |ext| ext == "essence" || ext == "eprime" || ext == "disabled") + entry.path().extension().map_or(false, |ext| { + ext == "essence" || ext == "eprime" || ext == "disabled" + }) }) .filter_map(|entry| { entry @@ -57,9 +54,7 @@ fn main() -> io::Result<()> { let essence_files = std::iter::zip(stems, exts).collect(); write_test(&mut f, subdir.path().display().to_string(), essence_files)?; - } - - else { + } else { let stems: Vec = read_dir(subdir.path())? .filter_map(Result::ok) .filter(|entry| { @@ -100,7 +95,7 @@ fn main() -> io::Result<()> { } } } - + Ok(()) }