sat-adaptor [DRAFT PR]

Cargo.toml

@@ -4,7 +4,6 @@ resolver = "2"
 default-members = [
     "conjure_oxide",
     "crates/conjure_core",
-    "solvers/kissat",
     "solvers/minion",
 ]
 
@@ -13,10 +12,9 @@ members = [
     "crates/conjure_core",
     "crates/enum_compatability_macro",
     "crates/conjure_macros",
-    "solvers/kissat",
     "solvers/minion",
     "crates/tree-sitter-essence",
-    "crates/tree_morph",
+    "crates/tree_morph", 
 ]
 
 [workspace.lints.clippy]

crates/conjure_core/Cargo.toml

@@ -32,6 +32,8 @@ schemars = "0.8.21"
 clap = { version = "4.5.26", features = ["derive"] }
 itertools = "0.14.0"
 im = "15.1.0"
+rustsat-minisat = "0.4.3"
+rustsat = "0.6.3"
 
 [lints]
 workspace = true

crates/conjure_core/src/ast/expressions.rs

@@ -34,6 +34,7 @@ pub enum Expression {
     /// Turns into a conjunction when it reaches a boolean context
     Bubble(Metadata, Box<Expression>, Box<Expression>),
 
+    // VAR: Temp
     Atomic(Metadata, Atom),
 
     /// `|x|` - absolute value of `x`

crates/conjure_core/src/solver/adaptors/mod.rs

@@ -1,11 +1,10 @@
 //! Solver adaptors.
 
-mod kissat;
 mod minion;
-mod sat_common;
+mod rustsat;
+use std::arch::x86_64;
 
 #[doc(inline)]
-pub use kissat::Kissat;
-
 #[doc(inline)]
 pub use minion::Minion;
+pub use rustsat::SAT;