fix: build.rs clippy warnings

conjure-cp · Jan 10, 2025 · fe3e1ee · fe3e1ee
1 parent a38ba68
commit fe3e1ee
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/conjure_oxide/build.rs b/conjure_oxide/build.rs
@@ -22,7 +22,7 @@ fn main() -> io::Result<()> {
                 let stems: Vec<String> = read_dir(subdir.path())?
                     .filter_map(Result::ok)
                     .filter(|entry| {
-                        entry.path().extension().map_or(false, |ext| {
+                        entry.path().extension().is_some_and(|ext| {
                             ext == "essence" || ext == "eprime" || ext == "disabled"
                         })
                     })
@@ -38,7 +38,7 @@ fn main() -> io::Result<()> {
                 let exts: Vec<String> = read_dir(subdir.path())?
                     .filter_map(Result::ok)
                     .filter(|entry| {
-                        entry.path().extension().map_or(false, |ext| {
+                        entry.path().extension().is_some_and(|ext| {
                             ext == "essence" || ext == "eprime" || ext == "disabled"
                         })
                     })
@@ -61,7 +61,7 @@ fn main() -> io::Result<()> {
                         entry
                             .path()
                             .extension()
-                            .map_or(false, |ext| ext == "essence" || ext == "eprime")
+                            .is_some_and(|ext| ext == "essence" || ext == "eprime")
                     })
                     .filter_map(|entry| {
                         entry
@@ -78,7 +78,7 @@ fn main() -> io::Result<()> {
                         entry
                             .path()
                             .extension()
-                            .map_or(false, |ext| ext == "essence" || ext == "eprime")
+                            .is_some_and(|ext| ext == "essence" || ext == "eprime")
                     })
                     .filter_map(|entry| {
                         entry

diff --git a/crates/conjure_core/src/parse/example_models.rs b/crates/conjure_core/src/parse/example_models.rs
@@ -29,7 +29,7 @@ pub fn get_example_model(filename: &str) -> Result<Model, anyhow::Error> {
         if path.is_file()
             && path
                 .extension()
-                .map_or(false, |e| e == "essence" || e == "eprime")
+                .is_some_and(|e| e == "essence" || e == "eprime")
             && path.file_stem() == Some(std::ffi::OsStr::new(filename))
         {
             essence_path = path.to_path_buf();

diff --git a/crates/conjure_core/src/solver/adaptors/minion/adaptor.rs b/crates/conjure_core/src/solver/adaptors/minion/adaptor.rs
@@ -48,14 +48,14 @@ fn minion_rs_callback(solutions: HashMap<minion_ast::VarName, minion_ast::Consta
         .unwrap();
 
     let mut conjure_solutions: HashMap<conjure_ast::Name, conjure_ast::Literal> = HashMap::new();
+    let machine_name_re = Regex::new(r"__conjure_machine_name_([0-9]+)").unwrap();
     for (minion_name, minion_const) in solutions.into_iter() {
         let conjure_const = match minion_const {
             minion_ast::Constant::Bool(x) => conjure_ast::Literal::Bool(x),
             minion_ast::Constant::Integer(x) => conjure_ast::Literal::Int(x),
             _ => todo!(),
         };
 
-        let machine_name_re = Regex::new(r"__conjure_machine_name_([0-9]+)").unwrap();
         let conjure_name = if let Some(caps) = machine_name_re.captures(&minion_name) {
             conjure_ast::Name::MachineName(caps[1].parse::<i32>().unwrap())
         } else {