Skip to content

Commit

Permalink
Auto merge of rust-lang#14558 - epage:complete, r=ehuss
Browse files Browse the repository at this point in the history
fix(complete): Fix problems on my machine

### What does this PR try to resolve?
This pulls in
- clap-rs/clap#5731 for `IFS` oddities I had
- clap-rs/clap#5733 with the hope that this makes `CARGO_COMPLETE_BASH cargo +nightly` just work

### How should we test and review this PR?

### Additional information

`clap` was completed next to `clap_complete` because `clap_complete` depends on unstable features from `clap`.
None should have changed in this time window but I wanted to exercise caution.
  • Loading branch information
bors committed Sep 18, 2024
2 parents 60fbfb9 + 90856d9 commit 7f44292
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
16 changes: 8 additions & 8 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ cargo-test-support = { version = "0.4.0", path = "crates/cargo-test-support" }
cargo-util = { version = "0.2.14", path = "crates/cargo-util" }
cargo-util-schemas = { version = "0.6.0", path = "crates/cargo-util-schemas" }
cargo_metadata = "0.18.1"
clap = "4.5.11"
clap_complete = { version = "4.5.24", features = ["unstable-dynamic"] }
clap = "4.5.17"
clap_complete = { version = "4.5.28", features = ["unstable-dynamic"] }
color-print = "0.3.6"
completest-pty = "0.5.3"
core-foundation = { version = "0.10.0", features = ["mac_os_10_7_support"] }
Expand Down

0 comments on commit 7f44292

Please sign in to comment.