Merge pull request #340 from niklasdewally/remove-uniplate-files

Remove uniplate files, use version from crates.io

Cargo.toml

@@ -6,16 +6,13 @@ default-members = [
     "crates/conjure_core",
     "solvers/kissat",
     "solvers/minion",
-    "crates/uniplate",
 ]
 
 members = [
     "conjure_oxide",
     "crates/conjure_core",
     "crates/enum_compatability_macro",
     "crates/conjure_macros",
-    "crates/uniplate",
-    "crates/uniplate_derive",
     "solvers/kissat",
     "solvers/minion",
     "solvers/chuffed",

conjure_oxide/Cargo.toml

@@ -10,9 +10,9 @@ walkdir = "2.5.0"
 
 [dependencies]
 conjure_core = { path = "../crates/conjure_core" }
-uniplate = {path = "../crates/uniplate"}
 minion_rs = { path = "../solvers/minion" }
 
+uniplate = "0.1.1"
 serde = { version = "1.0.203", features = ["derive"] }
 serde_json = "1.0.119"
 serde_with = "3.8.2"

conjure_oxide/tests/rewrite_tests.rs

@@ -13,7 +13,7 @@ use conjure_oxide::{
     utils::testing::save_stats_json,
     Metadata, Model, Rule,
 };
-use uniplate::biplate::Uniplate;
+use uniplate::Uniplate;
 
 #[test]
 fn rules_present() {

crates/conjure_core/Cargo.toml

@@ -6,9 +6,9 @@ edition = "2021"
 [dependencies]
 conjure_macros = { path = "../conjure_macros" }
 enum_compatability_macro = { path = "../enum_compatability_macro" }
-uniplate = { path = "../uniplate"}
 minion_rs = { path = "../../solvers/minion" }
 
+uniplate = "0.1.1"
 project-root = "0.2.2"
 linkme = "0.3.27"
 serde = { version = "1.0.203", features = ["derive"] }

crates/conjure_core/src/ast/constants.rs

@@ -1,7 +1,8 @@
 use std::fmt::{Display, Formatter};
 
 use serde::{Deserialize, Serialize};
-use uniplate::Uniplate;
+use uniplate::derive::Uniplate;
+use uniplate::{Biplate, Uniplate};
 
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Uniplate)]
 #[uniplate()]

crates/conjure_core/src/ast/expressions.rs

@@ -3,7 +3,8 @@ use std::fmt::{Display, Formatter};
 use serde::{Deserialize, Serialize};
 
 use enum_compatability_macro::document_compatibility;
-use uniplate::Uniplate;
+use uniplate::derive::Uniplate;
+use uniplate::{Biplate, Uniplate};
 
 use crate::ast::constants::Constant;
 use crate::ast::symbol_table::{Name, SymbolTable};

crates/conjure_core/src/rule_engine/rewrite.rs

@@ -4,7 +4,7 @@ use std::fmt::Display;
 use thiserror::Error;
 
 use crate::stats::RewriterStats;
-use uniplate::biplate::Uniplate;
+use uniplate::Uniplate;
 
 use crate::rule_engine::{Reduction, Rule, RuleSet};
 use crate::{

crates/conjure_core/src/rules/base.rs

@@ -6,7 +6,7 @@ use conjure_core::rule_engine::{
     register_rule, register_rule_set, ApplicationError, ApplicationResult, Reduction,
 };
 use conjure_core::Model;
-use uniplate::biplate::Uniplate;
+use uniplate::Uniplate;
 
 /*****************************************************************************/
 /*        This file contains basic rules for simplifying expressions         */

crates/conjure_core/src/rules/bubble.rs

@@ -4,7 +4,7 @@ use conjure_core::rule_engine::{
     register_rule, register_rule_set, ApplicationError, ApplicationResult, Reduction,
 };
 use conjure_core::Model;
-use uniplate::biplate::Uniplate;
+use uniplate::Uniplate;
 
 register_rule_set!("Bubble", 254, ("Base"));
 

crates/conjure_core/src/rules/minion.rs

@@ -11,7 +11,7 @@ use crate::rule_engine::{
 };
 use crate::solver::SolverFamily;
 use crate::Model;
-use uniplate::biplate::Uniplate;
+use uniplate::Uniplate;
 
 register_rule_set!("Minion", 100, ("Base"), (SolverFamily::Minion));