Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump cargo version #397

Merged
merged 1 commit into from
Sep 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cargo-c"
version = "0.10.3+cargo-0.81.0"
version = "0.10.4+cargo-0.82.0"
authors = ["Luca Barbato <[email protected]>"]
description = "Helper program to build and install c-like libraries"
license = "MIT"
Expand Down Expand Up @@ -28,7 +28,7 @@ name = "cargo-ctest"
path = "src/bin/ctest.rs"

[dependencies]
cargo = "0.81.0"
cargo = "0.82.0"
cargo-util = "0.2"
semver = "1.0.3"
log = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion src/bin/capi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ fn main() -> CliResult {
if cmd == "install" {
cinstall(&ws, &packages)?;
} else if cmd == "test" {
ctest(&ws, &config, subcommand_args, &packages, compile_opts)?;
ctest(&ws, subcommand_args, &packages, compile_opts)?;
}

Ok(())
Expand Down
2 changes: 1 addition & 1 deletion src/bin/ctest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@ fn main() -> CliResult {

let (packages, compile_opts) = cbuild(&mut ws, &config, subcommand_args, "dev")?;

ctest(&ws, &config, subcommand_args, &packages, compile_opts)
ctest(&ws, subcommand_args, &packages, compile_opts)
}
5 changes: 2 additions & 3 deletions src/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1068,7 +1068,7 @@ pub fn cbuild(
let only_staticlib = !libkinds.contains(&"cdylib");
let only_cdylib = !libkinds.contains(&"staticlib");

let profile = args.get_profile_name(config, default_profile, ProfileChecking::Custom)?;
let profile = args.get_profile_name(default_profile, ProfileChecking::Custom)?;

let profiles = Profiles::new(ws, profile)?;

Expand Down Expand Up @@ -1254,13 +1254,12 @@ pub fn cbuild(

pub fn ctest(
ws: &Workspace,
config: &GlobalContext,
args: &ArgMatches,
packages: &[CPackage],
mut compile_opts: CompileOptions,
) -> CliResult {
compile_opts.build_config.requested_profile =
args.get_profile_name(config, "test", ProfileChecking::Custom)?;
args.get_profile_name("test", ProfileChecking::Custom)?;
compile_opts.build_config.mode = CompileMode::Test;

compile_opts.filter = ops::CompileFilter::new(
Expand Down
Loading