From 84d137a19feb1f79f5bd711faff63a6bbe651cbf Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 22 Feb 2026 18:25:16 +0900 Subject: feat(resolver): replace pubgrub with Composer-ported SAT solver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add mozart-sat-resolver crate implementing a CDCL SAT-based dependency resolver ported from Composer's DependencyResolver. This replaces the pubgrub library to ensure identical resolution behavior with Composer. The new crate includes: pool (package storage with integer IDs), rule/rule_set/rule_set_generator (constraint encoding), decisions (assignment tracking), rule_watch_graph (2-watched literal BCP), solver (CDCL loop with conflict analysis and clause learning), policy (version preference), problem (Composer-style error messages), and transaction (install/update/uninstall operation computation). The registry resolver is rewritten to use PoolBuilder → RuleSetGenerator → Solver pipeline instead of pubgrub's DependencyProvider trait. Co-Authored-By: Claude Opus 4.6 --- Cargo.lock | 44 +++++++++----------------------------------- 1 file changed, 9 insertions(+), 35 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index 5beeed7..81ad0a7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1160,8 +1160,8 @@ dependencies = [ "md5", "mozart-core", "mozart-metadata-minifier", + "mozart-sat-resolver", "mozart-semver", - "pubgrub", "reqwest", "serde", "serde_json", @@ -1172,6 +1172,14 @@ dependencies = [ "zip", ] +[[package]] +name = "mozart-sat-resolver" +version = "0.1.0" +dependencies = [ + "mozart-core", + "mozart-semver", +] + [[package]] name = "mozart-semver" version = "0.1.0" @@ -1331,17 +1339,6 @@ dependencies = [ "syn", ] -[[package]] -name = "priority-queue" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93980406f12d9f8140ed5abe7155acb10bb1e69ea55c88960b9c2f117445ef96" -dependencies = [ - "equivalent", - "indexmap", - "serde", -] - [[package]] name = "proc-macro2" version = "1.0.106" @@ -1351,20 +1348,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "pubgrub" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f5df7e552bc7edd075f5783a87fbfc21d6a546e32c16985679c488c18192d83" -dependencies = [ - "indexmap", - "log", - "priority-queue", - "rustc-hash", - "thiserror 2.0.18", - "version-ranges", -] - [[package]] name = "quinn" version = "0.11.9" @@ -2240,15 +2223,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" -[[package]] -name = "version-ranges" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3595ffe225639f1e0fd8d7269dcc05d2fbfea93cfac2fea367daf1adb60aae91" -dependencies = [ - "smallvec", -] - [[package]] name = "version_check" version = "0.9.5" -- cgit v1.3.1