Skip to content

Commit 93cff7d

Browse files
committed
Bump cargo version
1 parent e571bcc commit 93cff7d

3 files changed

Lines changed: 13 additions & 7 deletions

File tree

Cargo.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "cargo-c"
3-
version = "0.10.19+cargo-0.93.0"
3+
version = "0.10.20+cargo-0.94.0"
44
authors = ["Luca Barbato <lu_zero@gentoo.org>"]
55
description = "Helper program to build and install c-like libraries"
66
license = "MIT"
@@ -9,7 +9,7 @@ readme = "README.md"
99
repository = "https://github.com/lu-zero/cargo-c"
1010
categories = ["command-line-utilities", "development-tools::cargo-plugins"]
1111
keywords = ["cargo", "cdylib"]
12-
rust-version = "1.90"
12+
rust-version = "1.91"
1313

1414
[[bin]]
1515
name = "cargo-capi"
@@ -28,7 +28,7 @@ name = "cargo-ctest"
2828
path = "src/bin/ctest.rs"
2929

3030
[dependencies]
31-
cargo = "0.93.0"
31+
cargo = "0.94.0"
3232
cargo-util = "0.2"
3333
semver = "1.0.3"
3434
log = "0.4"
@@ -46,6 +46,7 @@ itertools = "0.14"
4646
implib = "0.4.0"
4747
object = { version = "0.38.0", default-features = false, features = ["std", "read_core", "pe"] }
4848
cargo-platform = "0.3.1"
49+
clap_complete = "4.5.65"
4950

5051
[features]
5152
default = []

src/build.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ use cargo::core::{FeatureValue, Package, PackageId, Target, TargetKind, Workspac
1212
use cargo::ops::{self, CompileFilter, CompileOptions, FilterRule, LibRule};
1313
use cargo::util::command_prelude::{ArgMatches, ArgMatchesExt, ProfileChecking, UserIntent};
1414
use cargo::util::interning::InternedString;
15+
use cargo::util::BuildLogger;
1516
use cargo::{CliResult, GlobalContext};
1617

1718
use anyhow::Context as _;
@@ -912,7 +913,8 @@ fn compile_with_exec(
912913
) -> CargoResult<HashMap<PackageId, PathBuf>> {
913914
ws.emit_warnings()?;
914915
let interner = UnitInterner::new();
915-
let mut bcx = create_bcx(ws, options, &interner)?;
916+
let logger = BuildLogger::maybe_new(ws)?;
917+
let mut bcx = create_bcx(ws, options, &interner, logger.as_ref())?;
916918
let unit_graph = &bcx.unit_graph;
917919
let extra_compiler_args = &mut bcx.extra_compiler_args;
918920

src/cli.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
use std::ffi::{OsStr, OsString};
22
use std::path::PathBuf;
33

4-
use cargo::util::command_prelude::CommandExt;
54
use cargo::util::command_prelude::{flag, multi_opt, opt};
5+
use cargo::util::command_prelude::{get_ws_member_candidates, CommandExt};
66
use cargo::util::{style, CliError, CliResult};
77

88
use cargo_util::{ProcessBuilder, ProcessError};
99

1010
use clap::{Arg, ArgAction, ArgMatches, Command, CommandFactory, Parser};
11+
use clap_complete::ArgValueCandidates;
1112

1213
use crate::target::Target;
1314

@@ -136,8 +137,7 @@ fn base_cli() -> Command {
136137
.arg_target_triple("Build for the target triple")
137138
.arg_target_dir()
138139
.arg_manifest_path()
139-
.arg_message_format()
140-
.arg_build_plan();
140+
.arg_message_format();
141141

142142
if let Ok(t) = default_target {
143143
app.mut_arg("prefix", |a| {
@@ -166,6 +166,7 @@ pub fn subcommand_build(name: &'static str, about: &'static str) -> Command {
166166
"Package to build (see `cargo help pkgid`)",
167167
"Build all packages in the workspace",
168168
"Exclude packages from the build",
169+
ArgValueCandidates::new(get_ws_member_candidates),
169170
)
170171
.after_help(
171172
"
@@ -188,6 +189,7 @@ pub fn subcommand_install(name: &'static str, about: &'static str) -> Command {
188189
"Package to install (see `cargo help pkgid`)",
189190
"Install all packages in the workspace",
190191
"Exclude packages from being installed",
192+
ArgValueCandidates::new(get_ws_member_candidates),
191193
)
192194
.after_help(
193195
"
@@ -218,6 +220,7 @@ pub fn subcommand_test(name: &'static str) -> Command {
218220
"Package to run tests for",
219221
"Test all packages in the workspace",
220222
"Exclude packages from the test",
223+
ArgValueCandidates::new(get_ws_member_candidates),
221224
)
222225
.arg(flag("no-run", "Compile, but don't run tests"))
223226
.arg(flag("no-fail-fast", "Run all tests regardless of failure"))

0 commit comments

Comments
 (0)