Merge pull request #289 from gskorokhod/simple-cli

conjure-cp · Apr 3, 2024 · 27dc2da · 27dc2da
2 parents 4945113 + 26130ad
commit 27dc2da
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/conjure_oxide/tests/model_tests.rs b/conjure_oxide/tests/model_tests.rs
@@ -2,7 +2,6 @@
 
 use std::collections::HashMap;
 
-use conjure_core::context::Context;
 use conjure_core::metadata::Metadata;
 use conjure_core::model::Model;
 use conjure_oxide::ast::*;

diff --git a/conjure_oxide/tests/rewrite_tests.rs b/conjure_oxide/tests/rewrite_tests.rs
@@ -9,7 +9,7 @@ use conjure_oxide::{
     ast::*,
     get_rule_by_name, get_rules,
     rule_engine::{resolve_rule_sets, rewrite_model},
-    solver::{adaptors, Solver, SolverAdaptor as _},
+    solver::{adaptors, Solver},
     utils::testing::save_stats_json,
     Metadata, Model, Rule,
 };
@@ -919,7 +919,7 @@ fn rewrite_solve_xyz() {
 fn rewrite_solve_xyz_parameterized() {
     println!("Rules: {:?}", get_rules());
 
-    let rule_sets = match resolve_rule_sets(SolverFamily::Minion, &vec!["Constant"]) {
+    let rule_sets = match resolve_rule_sets(SolverFamily::Minion, &vec!["Constant".to_string()]) {
         Ok(rs) => rs,
         Err(e) => {
             eprintln!("Error resolving rule sets: {}", e);
@@ -992,12 +992,14 @@ fn rewrite_solve_xyz_parameterized() {
             model_for_rewrite.context,
             "tests",
             &info_file_name_optimized,
-        );
+        )
+        .expect("Could not save stats!");
         save_stats_json(
             model_for_rewrite_unoptimized.context,
             "tests",
             &info_file_name_unoptimized,
-        );
+        )
+        .expect("Could not save stats!");
 
         // Check if the expression is in its simplest form
         let expr = rewritten_expr.clone();

diff --git a/crates/conjure_core/src/ast/expressions.rs b/crates/conjure_core/src/ast/expressions.rs
@@ -206,34 +206,34 @@ impl Expression {
                 box1.set_clean(bool_value);
                 box2.set_clean(bool_value);
             }
-            Expression::Neq(metadata, box1, box2) => {
+            Expression::Neq(metadata, _box1, _box2) => {
                 metadata.clean = bool_value;
             }
-            Expression::Geq(metadata, box1, box2) => {
+            Expression::Geq(metadata, _box1, _box2) => {
                 metadata.clean = bool_value;
             }
-            Expression::Leq(metadata, box1, box2) => {
+            Expression::Leq(metadata, _box1, _box2) => {
                 metadata.clean = bool_value;
             }
-            Expression::Gt(metadata, box1, box2) => {
+            Expression::Gt(metadata, _box1, _box2) => {
                 metadata.clean = bool_value;
             }
-            Expression::Lt(metadata, box1, box2) => {
+            Expression::Lt(metadata, _box1, _box2) => {
                 metadata.clean = bool_value;
             }
-            Expression::SumGeq(metadata, box1, box2) => {
+            Expression::SumGeq(metadata, _box1, _box2) => {
                 metadata.clean = bool_value;
             }
-            Expression::SumLeq(metadata, box1, box2) => {
+            Expression::SumLeq(metadata, _box1, _box2) => {
                 metadata.clean = bool_value;
             }
-            Expression::Ineq(metadata, box1, box2, box3) => {
+            Expression::Ineq(metadata, _box1, _box2, _box3) => {
                 metadata.clean = bool_value;
             }
-            Expression::AllDiff(metadata, exprs) => {
+            Expression::AllDiff(metadata, _exprs) => {
                 metadata.clean = bool_value;
             }
-            Expression::SumEq(metadata, exprs, expr) => {
+            Expression::SumEq(metadata, _exprs, _expr) => {
                 metadata.clean = bool_value;
             }
         }

diff --git a/crates/uniplate/tests/expr_stmt_manual.rs b/crates/uniplate/tests/expr_stmt_manual.rs
@@ -156,6 +156,7 @@ impl Biplate<Stmt> for Expr {
 }
 
 //this is the most interesting example!
+#[allow(clippy::type_complexity)]
 impl Biplate<Expr> for Stmt {
     fn biplate(&self) -> (Tree<Expr>, Box<dyn Fn(Tree<Expr>) -> Stmt>) {
         match self.clone() {