Skip to content

Commit

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

9 commits in 1cd6d3803dfb0b342272862a8590f5dfc9f72573..a5d47a72595dd6fbe7d4e4f6ec20dc5fe724edd1 2023-01-12 18:40:36 +0000 to 2023-01-16 18:51:50 +0000

- Add network container tests (rust-lang/cargo#11583)
- Show progress of crates.io index update even `net.git-fetch-with-cli` option enabled (rust-lang/cargo#11579)
- `cargo metadata` supports artifact dependencies (rust-lang/cargo#11550)
- fix(docs): add required "inherits" option to example profile (rust-lang/cargo#11504)
- add documentation that SSH markers aren't supported (rust-lang/cargo#11586)
- Fix typo (rust-lang/cargo#11585)
- Enable source_config_env test on Windows (rust-lang/cargo#11582)
- Support `codegen-backend` and `rustflags` in profiles in config file (rust-lang/cargo#11562)
- ci: reflect to clap updates (rust-lang/cargo#11578)

r? `@ghost`
  • Loading branch information
bors committed Jan 18, 2023
2 parents edefa41 + 335e904 commit e08b379
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
20 changes: 10 additions & 10 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ dependencies = [
"cargo-test-macro",
"cargo-test-support",
"cargo-util",
"clap 4.0.32",
"clap 4.1.1",
"crates-io",
"curl",
"curl-sys",
Expand Down Expand Up @@ -655,12 +655,12 @@ dependencies = [

[[package]]
name = "clap"
version = "4.0.32"
version = "4.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7db700bc935f9e43e88d00b0850dae18a63773cfbec6d8e070fccf7fef89a39"
checksum = "4ec7a4128863c188deefe750ac1d1dfe66c236909f845af04beed823638dc1b2"
dependencies = [
"bitflags",
"clap_derive 4.0.21",
"clap_derive 4.1.0",
"clap_lex 0.3.0",
"is-terminal",
"once_cell",
Expand All @@ -675,7 +675,7 @@ version = "4.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "10861370d2ba66b0f5989f83ebf35db6421713fd92351790e7fdd6c36774c56b"
dependencies = [
"clap 4.0.32",
"clap 4.1.1",
]

[[package]]
Expand All @@ -693,9 +693,9 @@ dependencies = [

[[package]]
name = "clap_derive"
version = "4.0.21"
version = "4.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014"
checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8"
dependencies = [
"heck",
"proc-macro-error",
Expand Down Expand Up @@ -2294,7 +2294,7 @@ name = "jsondoclint"
version = "0.1.0"
dependencies = [
"anyhow",
"clap 4.0.32",
"clap 4.1.1",
"fs-err",
"rustdoc-json-types",
"serde",
Expand Down Expand Up @@ -2557,7 +2557,7 @@ dependencies = [
"ammonia",
"anyhow",
"chrono",
"clap 4.0.32",
"clap 4.1.1",
"clap_complete",
"elasticlunr-rs",
"env_logger 0.10.0",
Expand Down Expand Up @@ -3528,7 +3528,7 @@ dependencies = [
name = "rustbook"
version = "0.1.0"
dependencies = [
"clap 4.0.32",
"clap 4.1.1",
"env_logger 0.7.1",
"mdbook",
]
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 50 files
+4 −0 .github/workflows/main.yml
+1 −1 Cargo.toml
+17 −0 crates/cargo-test-macro/src/lib.rs
+1 −0 crates/cargo-test-support/build.rs
+26 −0 crates/cargo-test-support/containers/apache/Dockerfile
+4 −0 crates/cargo-test-support/containers/apache/bar/Cargo.toml
+1 −0 crates/cargo-test-support/containers/apache/bar/src/lib.rs
+12 −0 crates/cargo-test-support/containers/apache/httpd-cargo.conf
+29 −0 crates/cargo-test-support/containers/sshd/Dockerfile
+4 −0 crates/cargo-test-support/containers/sshd/bar/Cargo.toml
+1 −0 crates/cargo-test-support/containers/sshd/bar/src/lib.rs
+285 −0 crates/cargo-test-support/src/containers.rs
+7 −0 crates/cargo-test-support/src/lib.rs
+42 −2 src/cargo/core/compiler/artifact.rs
+3 −40 src/cargo/core/compiler/unit_dependencies.rs
+14 −7 src/cargo/core/dependency.rs
+4 −0 src/cargo/core/features.rs
+1 −2 src/cargo/core/package.rs
+6 −1 src/cargo/core/profiles.rs
+134 −35 src/cargo/ops/cargo_output_metadata.rs
+2 −1 src/cargo/sources/git/known_hosts.rs
+11 −2 src/cargo/sources/git/utils.rs
+1 −1 src/cargo/sources/registry/index.rs
+1 −1 src/cargo/util/network.rs
+46 −13 src/cargo/util/toml/mod.rs
+27 −0 src/doc/contrib/src/tests/running.md
+13 −0 src/doc/contrib/src/tests/writing.md
+5 −0 src/doc/src/appendix/git-authentication.md
+1 −0 src/doc/src/reference/config.md
+25 −0 src/doc/src/reference/unstable.md
+0 −3 tests/testsuite/advanced_env.rs
+2 −2 tests/testsuite/cargo_add/dev_build_conflict/stderr.log
+3 −3 tests/testsuite/cargo_add/invalid_arg/stderr.log
+2 −2 tests/testsuite/cargo_add/invalid_target_empty/stderr.log
+2 −2 tests/testsuite/cargo_add/no_args/stderr.log
+3 −3 tests/testsuite/cargo_remove/invalid_arg/stderr.log
+2 −2 tests/testsuite/cargo_remove/no_arg/stderr.log
+2 −0 tests/testsuite/git.rs
+152 −0 tests/testsuite/https.rs
+3 −3 tests/testsuite/init/unknown_flags/stderr.log
+2 −4 tests/testsuite/install.rs
+4 −4 tests/testsuite/login.rs
+2 −0 tests/testsuite/main.rs
+136 −4 tests/testsuite/metadata.rs
+3 −5 tests/testsuite/new.rs
+61 −0 tests/testsuite/profile_config.rs
+5 −2 tests/testsuite/run.rs
+1 −1 tests/testsuite/rustc.rs
+548 −0 tests/testsuite/ssh.rs
+2 −2 tests/testsuite/vendor.rs

0 comments on commit e08b379

Please sign in to comment.