From e519dbb18477ec43be10f8af4e69019a569e19c8 Mon Sep 17 00:00:00 2001
From: "Jip J. Dekker" <jip@dekker.one>
Date: Thu, 13 Jun 2024 10:26:09 +1000
Subject: [PATCH] Update pindakaas library

---
 Cargo.lock                | 40 +++++++++++++++++++--------------------
 crates/huub/src/solver.rs |  8 ++------
 2 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7c41dd8e..027d1834 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -93,9 +93,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "backtrace"
-version = "0.3.72"
+version = "0.3.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11"
+checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
 dependencies = [
  "addr2line",
  "cc",
@@ -162,9 +162,9 @@ checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0"
 
 [[package]]
 name = "cc"
-version = "1.0.98"
+version = "1.0.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f"
+checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"
 dependencies = [
  "jobserver",
  "libc",
@@ -185,9 +185,9 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
 
 [[package]]
 name = "clap"
-version = "4.5.4"
+version = "4.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
+checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -195,9 +195,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.2"
+version = "4.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
+checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f"
 dependencies = [
  "anstream",
  "anstyle",
@@ -207,9 +207,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.4"
+version = "4.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"
+checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -219,9 +219,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
+checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70"
 
 [[package]]
 name = "colorchoice"
@@ -622,9 +622,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.35.0"
+version = "0.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e"
+checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434"
 dependencies = [
  "memchr",
 ]
@@ -685,7 +685,7 @@ checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
 [[package]]
 name = "pindakaas"
 version = "0.1.0"
-source = "git+https://github.com/pindakaashq/pindakaas.git#507ba3bb6edec0133e872d6f0deee3e80df61926"
+source = "git+https://github.com/pindakaashq/pindakaas.git#190676adb1bd135823dc62e1bb82f8c085eaa276"
 dependencies = [
  "cached",
  "iset",
@@ -699,7 +699,7 @@ dependencies = [
 [[package]]
 name = "pindakaas-build-macros"
 version = "0.1.0"
-source = "git+https://github.com/pindakaashq/pindakaas.git#507ba3bb6edec0133e872d6f0deee3e80df61926"
+source = "git+https://github.com/pindakaashq/pindakaas.git#190676adb1bd135823dc62e1bb82f8c085eaa276"
 dependencies = [
  "cc",
  "paste",
@@ -708,7 +708,7 @@ dependencies = [
 [[package]]
 name = "pindakaas-cadical"
 version = "2.0.0"
-source = "git+https://github.com/pindakaashq/pindakaas.git#507ba3bb6edec0133e872d6f0deee3e80df61926"
+source = "git+https://github.com/pindakaashq/pindakaas.git#190676adb1bd135823dc62e1bb82f8c085eaa276"
 dependencies = [
  "cc",
  "pindakaas-build-macros",
@@ -717,7 +717,7 @@ dependencies = [
 [[package]]
 name = "pindakaas-derive"
 version = "0.1.0"
-source = "git+https://github.com/pindakaashq/pindakaas.git#507ba3bb6edec0133e872d6f0deee3e80df61926"
+source = "git+https://github.com/pindakaashq/pindakaas.git#190676adb1bd135823dc62e1bb82f8c085eaa276"
 dependencies = [
  "darling 0.20.9",
  "quote",
@@ -1036,9 +1036,9 @@ dependencies = [
 
 [[package]]
 name = "utf8parse"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "valuable"
diff --git a/crates/huub/src/solver.rs b/crates/huub/src/solver.rs
index e0c1cf61..1336463c 100644
--- a/crates/huub/src/solver.rs
+++ b/crates/huub/src/solver.rs
@@ -356,9 +356,7 @@ where
 {
 	fn from(value: Cnf) -> Self {
 		let mut core: Sat = value.into();
-		let None = core.set_external_propagator(Some(Box::<Engine>::default())) else {
-			unreachable!()
-		};
+		core.set_external_propagator(Some(Engine::default()));
 		core.set_learn_callback(Some(trace_learned_clause));
 		Self { oracle: core }
 	}
@@ -372,9 +370,7 @@ where
 	fn clone(&self) -> Self {
 		let mut core = self.oracle.clone();
 		let engine = self.engine().clone();
-		let None = core.set_external_propagator(Some(Box::new(engine))) else {
-			unreachable!()
-		};
+		core.set_external_propagator(Some(engine));
 		core.set_learn_callback(Some(trace_learned_clause));
 		Self { oracle: core }
 	}