refactor: remove rattler_libsolv_rs (#350)

Removes `rattler_libsolv_rs` and replaces it with [resolvo](https://github.com/mamba-org/resolvo).
conda · Sep 25, 2023 · 8b82537 · 8b82537
1 parent 61ed341
commit 8b82537
Show file tree

Hide file tree

Showing 52 changed files with 37 additions and 5,845 deletions.
diff --git a/.github/workflows/rust-compile.yml b/.github/workflows/rust-compile.yml
@@ -14,7 +14,7 @@ env:
   RUST_BACKTRACE: 1
   RUSTFLAGS: "-D warnings"
   CARGO_TERM_COLOR: always
-  DEFAULT_FEATURES: tokio,serde,reqwest,sparse,sysinfo,libsolv_rs
+  DEFAULT_FEATURES: tokio,serde,reqwest,sparse,sysinfo,resolvo
 
 jobs:
   check-rustdoc-links:

diff --git a/crates/rattler-bin/Cargo.toml b/crates/rattler-bin/Cargo.toml
@@ -33,7 +33,7 @@ rattler = { version = "0.9.0", path = "../rattler", default-features = false }
 rattler_networking = { version = "0.9.0", path = "../rattler_networking", default-features = false }
 rattler_conda_types = { version = "0.9.0", path = "../rattler_conda_types" }
 rattler_repodata_gateway = { version = "0.9.0", path = "../rattler_repodata_gateway", features = ["sparse"], default-features = false }
-rattler_solve = { version = "0.9.0", path = "../rattler_solve", features = ["libsolv_rs", "libsolv_c"] }
+rattler_solve = { version = "0.9.0", path = "../rattler_solve", features = ["resolvo", "libsolv_c"] }
 rattler_virtual_packages = { version = "0.9.0", path = "../rattler_virtual_packages" }
 reqwest = { version = "0.11.20", default-features = false }
 tokio = { version = "1.32.0", features = ["rt-multi-thread", "macros"] }

diff --git a/crates/rattler-bin/src/commands/create.rs b/crates/rattler-bin/src/commands/create.rs
@@ -18,7 +18,7 @@ use rattler_repodata_gateway::fetch::{
     CacheResult, DownloadProgress, FetchRepoDataError, FetchRepoDataOptions,
 };
 use rattler_repodata_gateway::sparse::SparseRepoData;
-use rattler_solve::{libsolv_c, libsolv_rs, SolverImpl, SolverTask};
+use rattler_solve::{libsolv_c, resolvo, SolverImpl, SolverTask};
 use reqwest::Client;
 use std::{
     borrow::Cow,
@@ -225,7 +225,7 @@ pub async fn create(opt: Opt) -> anyhow::Result<()> {
     let use_libsolv_rs = opt.use_experimental_libsolv_rs;
     let required_packages = wrap_in_progress("solving", move || {
         if use_libsolv_rs {
-            libsolv_rs::Solver.solve(solver_task)
+            resolvo::Solver.solve(solver_task)
         } else {
             libsolv_c::Solver.solve(solver_task)
         }

diff --git a/crates/rattler_libsolv_rs/Cargo.toml b/crates/rattler_libsolv_rs/Cargo.toml
diff --git a/crates/rattler_libsolv_rs/src/internal/arena.rs b/crates/rattler_libsolv_rs/src/internal/arena.rs
diff --git a/crates/rattler_libsolv_rs/src/internal/frozen_copy_map.rs b/crates/rattler_libsolv_rs/src/internal/frozen_copy_map.rs