Skip to content

Commit

Permalink
Auto merge of rust-lang#102677 - weihanglo:update-cargo, r=ehuss
Browse files Browse the repository at this point in the history
Update cargo

8 commits in f5fed93ba24607980647962c59863bbabb03ce14..0b84a35c2c7d70df4875a03eb19084b0e7a543ef 2022-09-27 12:03:57 +0000 to 2022-10-03 19:13:21 +0000

- Provide a better error message when mixing dep: with / (rust-lang/cargo#11172)
- Remove lingering unstable flag `-Zfeatures` (rust-lang/cargo#11168)
- Tweak wording (rust-lang/cargo#11164)
- Expose libgit2-sys/vendored feature as vendored-libgit2 (rust-lang/cargo#11162)
- refactor(cli): Upgrade to clap v4 (rust-lang/cargo#11159)
- Expose guide to adding a new edition as rustdoc (rust-lang/cargo#11157)
- Remove `multitarget` from -Zhelp (rust-lang/cargo#11158)
- Remove outdated comments (rust-lang/cargo#11155)
  • Loading branch information
bors committed Oct 5, 2022
2 parents d4846f9 + c1b4f11 commit d8613f7
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 10 deletions.
40 changes: 31 additions & 9 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ dependencies = [
"cargo-test-macro",
"cargo-test-support",
"cargo-util",
"clap",
"clap 4.0.9",
"crates-io",
"curl",
"curl-sys",
Expand Down Expand Up @@ -591,21 +591,34 @@ dependencies = [
"atty",
"bitflags",
"clap_derive",
"clap_lex",
"clap_lex 0.2.2",
"indexmap",
"once_cell",
"strsim",
"termcolor",
"textwrap",
]

[[package]]
name = "clap"
version = "4.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "30607dd93c420c6f1f80b544be522a0238a7db35e6a12968d28910983fee0df0"
dependencies = [
"atty",
"bitflags",
"clap_lex 0.3.0",
"strsim",
"termcolor",
]

[[package]]
name = "clap_complete"
version = "3.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df6f3613c0a3cddfd78b41b10203eb322cb29b600cbdf808a7d3db95691b8e25"
dependencies = [
"clap",
"clap 3.2.20",
]

[[package]]
Expand All @@ -630,6 +643,15 @@ dependencies = [
"os_str_bytes",
]

[[package]]
name = "clap_lex"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8"
dependencies = [
"os_str_bytes",
]

[[package]]
name = "clippy"
version = "0.1.65"
Expand Down Expand Up @@ -664,7 +686,7 @@ name = "clippy_dev"
version = "0.0.1"
dependencies = [
"aho-corasick",
"clap",
"clap 3.2.20",
"indoc",
"itertools",
"opener",
Expand Down Expand Up @@ -1809,7 +1831,7 @@ name = "installer"
version = "0.0.0"
dependencies = [
"anyhow",
"clap",
"clap 3.2.20",
"flate2",
"lazy_static",
"num_cpus",
Expand Down Expand Up @@ -2152,7 +2174,7 @@ dependencies = [
"ammonia",
"anyhow",
"chrono",
"clap",
"clap 3.2.20",
"clap_complete",
"elasticlunr-rs",
"env_logger 0.9.0",
Expand Down Expand Up @@ -3024,7 +3046,7 @@ dependencies = [
name = "rustbook"
version = "0.1.0"
dependencies = [
"clap",
"clap 3.2.20",
"env_logger 0.7.1",
"mdbook",
]
Expand Down Expand Up @@ -3111,7 +3133,7 @@ name = "rustc-workspace-hack"
version = "1.0.0"
dependencies = [
"bstr",
"clap",
"clap 3.2.20",
"libz-sys",
"regex",
"serde_json",
Expand Down Expand Up @@ -4338,7 +4360,7 @@ dependencies = [
"anyhow",
"bytecount",
"cargo_metadata 0.14.0",
"clap",
"clap 3.2.20",
"derive-new",
"diff",
"dirs",
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 40 files
+2 −1 Cargo.toml
+6 −9 src/bin/cargo/cli.rs
+13 −16 src/bin/cargo/commands/add.rs
+3 −3 src/bin/cargo/commands/bench.rs
+5 −1 src/bin/cargo/commands/config.rs
+2 −2 src/bin/cargo/commands/git_checkout.rs
+2 −2 src/bin/cargo/commands/help.rs
+1 −1 src/bin/cargo/commands/init.rs
+1 −1 src/bin/cargo/commands/install.rs
+1 −1 src/bin/cargo/commands/login.rs
+1 −1 src/bin/cargo/commands/new.rs
+1 −1 src/bin/cargo/commands/owner.rs
+1 −1 src/bin/cargo/commands/pkgid.rs
+2 −2 src/bin/cargo/commands/run.rs
+6 −2 src/bin/cargo/commands/rustc.rs
+1 −2 src/bin/cargo/commands/rustdoc.rs
+1 −1 src/bin/cargo/commands/search.rs
+3 −3 src/bin/cargo/commands/test.rs
+1 −1 src/bin/cargo/commands/uninstall.rs
+1 −0 src/bin/cargo/commands/vendor.rs
+1 −1 src/bin/cargo/commands/yank.rs
+2 −2 src/bin/cargo/main.rs
+64 −45 src/cargo/core/features.rs
+0 −3 src/cargo/core/resolver/features.rs
+30 −0 src/cargo/core/summary.rs
+13 −21 src/cargo/util/command_prelude.rs
+1 −1 src/doc/src/faq.md
+4 −5 tests/testsuite/cargo_add/dev_build_conflict/stderr.log
+5 −6 tests/testsuite/cargo_add/invalid_arg/stderr.log
+1 −1 tests/testsuite/cargo_add/invalid_target_empty/stderr.log
+5 −6 tests/testsuite/cargo_add/no_args/stderr.log
+9 −9 tests/testsuite/cargo_command.rs
+126 −0 tests/testsuite/features_namespaced.rs
+3 −4 tests/testsuite/init/unknown_flags/stderr.log
+2 −3 tests/testsuite/install.rs
+1 −1 tests/testsuite/metadata.rs
+1 −1 tests/testsuite/new.rs
+10 −3 tests/testsuite/run.rs
+1 −2 tests/testsuite/rustc.rs
+2 −3 tests/testsuite/vendor.rs

0 comments on commit d8613f7

Please sign in to comment.