Skip to content

Commit

Permalink
chore: rename libsolv crates (#253)
Browse files Browse the repository at this point in the history
* chore: rename libsolv crates

* fix: fmt

* fix: docs

* fix: insta snapshots

* fix: snapshots

* fix: benches

* fix: enable all targets when building
  • Loading branch information
baszalmstra authored Jul 7, 2023
1 parent e231dc0 commit 44fdae9
Show file tree
Hide file tree
Showing 89 changed files with 3,070 additions and 3,167 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/rust-compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
submodules: recursive
- uses: actions-rust-lang/setup-rust-toolchain@v1
- name: Run clippy
run: cargo check
run: cargo check --all-targets

check-rustdoc-links:
name: Check intra-doc links
Expand Down Expand Up @@ -158,7 +158,7 @@ jobs:
with:
use-cross: ${{ matrix.job.use-cross }}
command: build
args: --target=${{ matrix.job.target }} ${{ steps.build-options.outputs.CARGO_BUILD_OPTIONS}} --features ${{ env.DEFAULT_FEATURES }}
args: --target=${{ matrix.job.target }} --all-targets ${{ steps.build-options.outputs.CARGO_BUILD_OPTIONS}} --features ${{ env.DEFAULT_FEATURES }}

- name: Set test options
id: test-options
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "crates/rattler/libsolv"]
path = crates/libsolv-sys/libsolv
path = crates/rattler_libsolv_c/libsolv
url = https://github.com/baszalmstra/libsolv
3 changes: 2 additions & 1 deletion crates/rattler-bin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ homepage.workspace = true
repository.workspace = true
license.workspace = true
readme.workspace = true
default-run = "rattler"

[[bin]]
name = "rattler"
Expand All @@ -32,7 +33,7 @@ rattler = { version = "0.5.0", path = "../rattler", default-features = false }
rattler_networking = { version = "0.5.0", path = "../rattler_networking", default-features = false }
rattler_conda_types = { version = "0.5.0", path = "../rattler_conda_types" }
rattler_repodata_gateway = { version = "0.5.0", path = "../rattler_repodata_gateway", features = ["sparse"], default-features = false }
rattler_solve = { version = "0.5.0", path = "../rattler_solve", features = ["libsolv_rs", "libsolv-sys"] }
rattler_solve = { version = "0.5.0", path = "../rattler_solve", features = ["libsolv_rs", "libsolv_c"] }
rattler_virtual_packages = { version = "0.5.0", path = "../rattler_virtual_packages" }
reqwest = { version = "0.11.18", default-features = false }
tokio = { version = "1.28.2", features = ["rt-multi-thread", "macros"] }
Expand Down
4 changes: 2 additions & 2 deletions crates/rattler-bin/src/commands/create.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use rattler_repodata_gateway::fetch::{
CacheResult, DownloadProgress, FetchRepoDataError, FetchRepoDataOptions,
};
use rattler_repodata_gateway::sparse::SparseRepoData;
use rattler_solve::{libsolv_rs, libsolv_sys, SolverImpl, SolverTask};
use rattler_solve::{libsolv_c, libsolv_rs, SolverImpl, SolverTask};
use reqwest::{Client, StatusCode};
use std::{
borrow::Cow,
Expand Down Expand Up @@ -224,7 +224,7 @@ pub async fn create(opt: Opt) -> anyhow::Result<()> {
if use_libsolv_rs {
libsolv_rs::Solver.solve(solver_task)
} else {
libsolv_sys::Solver.solve(solver_task)
libsolv_c::Solver.solve(solver_task)
}
})?;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "libsolv-sys"
version = "0.1.0"
edition = "2021"
name = "rattler_libsolv_c"
version.workspace = true
edition.workspace = true
authors = ["Bas Zalmstra <zalmstra.bas@gmail.com>"]
description = "Bindings for libsolv"
categories.workspace = true
Expand Down
File renamed without changes.
Loading

0 comments on commit 44fdae9

Please sign in to comment.