diff --git a/Cargo.toml b/Cargo.toml index 6fe8f1e2..07111402 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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 "] description = "Helper program to build and install c-like libraries" license = "MIT" @@ -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" diff --git a/src/bin/capi.rs b/src/bin/capi.rs index 7f4bbd53..c4d76967 100644 --- a/src/bin/capi.rs +++ b/src/bin/capi.rs @@ -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(()) diff --git a/src/bin/ctest.rs b/src/bin/ctest.rs index e26cafff..531a9d52 100644 --- a/src/bin/ctest.rs +++ b/src/bin/ctest.rs @@ -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) } diff --git a/src/build.rs b/src/build.rs index 8e3470a7..fc307a54 100644 --- a/src/build.rs +++ b/src/build.rs @@ -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)?; @@ -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(