Skip to content

Commit

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

8 commits in ea2a21c994ca1e4d4c49412827b3cf4dcb158b1d..d6cdde584a1f15ea086bae922e20fd27f7165431
2022-02-15 04:24:07 +0000 to 2022-02-22 19:55:51 +0000
- Add common profile validation. (rust-lang/cargo#10411)
- Add -Z check-cfg-features to enable compile-time checking of features (rust-lang/cargo#10408)
- Remove invalid target-specific dependency example. (rust-lang/cargo#10401)
- Fix errors in `cargo fetch` usage guide (rust-lang/cargo#10398)
- Fix some broken doc links. (rust-lang/cargo#10404)
- Implement "artifact dependencies" (RFC-3028) (rust-lang/cargo#9992)
- Print executable name on cargo test --no-run rust-lang/cargo#2 (rust-lang/cargo#10346)
- Avoid new deprecation warnings from clap 3.1.0 (rust-lang/cargo#10396)
  • Loading branch information
@bors
bors committed Feb 23, 2022
2 parents bafe8d0 + 474803f commit c651ba8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ dependencies = [
"cargo-test-macro",
"cargo-test-support",
"cargo-util",
"clap 3.0.13",
"clap 3.1.1",
"crates-io",
"crossbeam-utils",
"curl",
Expand Down Expand Up @@ -606,9 +606,9 @@ dependencies = [

[[package]]
name = "clap"
version = "3.0.13"
version = "3.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08799f92c961c7a1cf0cc398a9073da99e21ce388b46372c37f3191f2f3eed3e"
checksum = "6d76c22c9b9b215eeb8d016ad3a90417bd13cb24cf8142756e6472445876cab7"
dependencies = [
"atty",
"bitflags",
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 91 files
+1 −1 Cargo.toml
+1 −0 crates/cargo-test-support/src/compare.rs
+4 −1 crates/cargo-test-support/src/cross_compile.rs
+16 −0 crates/cargo-test-support/src/registry.rs
+18 −12 src/bin/cargo/cli.rs
+1 −1 src/bin/cargo/commands/bench.rs
+2 −1 src/bin/cargo/commands/config.rs
+1 −1 src/bin/cargo/commands/git_checkout.rs
+2 −1 src/bin/cargo/commands/report.rs
+1 −1 src/bin/cargo/commands/run.rs
+1 −1 src/bin/cargo/commands/rustc.rs
+1 −1 src/bin/cargo/commands/rustdoc.rs
+1 −1 src/bin/cargo/commands/test.rs
+57 −0 src/cargo/core/compiler/artifact.rs
+31 −18 src/cargo/core/compiler/build_context/target_info.rs
+7 −4 src/cargo/core/compiler/compilation.rs
+2 −2 src/cargo/core/compiler/compile_kind.rs
+32 −1 src/cargo/core/compiler/context/compilation_files.rs
+3 −2 src/cargo/core/compiler/context/mod.rs
+6 −0 src/cargo/core/compiler/custom_build.rs
+2 −1 src/cargo/core/compiler/job_queue.rs
+13 −1 src/cargo/core/compiler/layout.rs
+39 −7 src/cargo/core/compiler/mod.rs
+7 −3 src/cargo/core/compiler/standard_lib.rs
+7 −1 src/cargo/core/compiler/unit.rs
+363 −94 src/cargo/core/compiler/unit_dependencies.rs
+6 −0 src/cargo/core/compiler/unit_graph.rs
+219 −0 src/cargo/core/dependency.rs
+5 −1 src/cargo/core/features.rs
+7 −0 src/cargo/core/manifest.rs
+38 −21 src/cargo/core/package.rs
+89 −54 src/cargo/core/profiles.rs
+194 −65 src/cargo/core/resolver/features.rs
+10 −10 src/cargo/core/resolver/resolve.rs
+89 −85 src/cargo/ops/cargo_compile.rs
+7 −2 src/cargo/ops/cargo_output_metadata.rs
+94 −24 src/cargo/ops/cargo_test.rs
+3 −3 src/cargo/ops/fix.rs
+3 −11 src/cargo/ops/resolve.rs
+2 −1 src/cargo/ops/tree/graph.rs
+4 −2 src/cargo/util/command_prelude.rs
+2 −6 src/cargo/util/dependency_queue.rs
+84 −27 src/cargo/util/toml/mod.rs
+2 −1 src/doc/man/cargo-fetch.md
+3 −3 src/doc/man/generated_txt/cargo-fetch.txt
+4 −2 src/doc/man/includes/options-target-triple.md
+1 −2 src/doc/src/commands/cargo-bench.md
+1 −2 src/doc/src/commands/cargo-build.md
+1 −2 src/doc/src/commands/cargo-check.md
+1 −2 src/doc/src/commands/cargo-clean.md
+1 −2 src/doc/src/commands/cargo-doc.md
+3 −3 src/doc/src/commands/cargo-fetch.md
+1 −2 src/doc/src/commands/cargo-fix.md
+1 −2 src/doc/src/commands/cargo-install.md
+1 −2 src/doc/src/commands/cargo-package.md
+1 −2 src/doc/src/commands/cargo-publish.md
+1 −2 src/doc/src/commands/cargo-run.md
+1 −2 src/doc/src/commands/cargo-rustc.md
+1 −2 src/doc/src/commands/cargo-rustdoc.md
+1 −2 src/doc/src/commands/cargo-test.md
+4 −5 src/doc/src/reference/config.md
+2 −2 src/doc/src/reference/specifying-dependencies.md
+63 −0 src/doc/src/reference/unstable.md
+1 −2 src/etc/man/cargo-bench.1
+1 −2 src/etc/man/cargo-build.1
+1 −2 src/etc/man/cargo-check.1
+1 −2 src/etc/man/cargo-clean.1
+1 −2 src/etc/man/cargo-doc.1
+2 −3 src/etc/man/cargo-fetch.1
+1 −2 src/etc/man/cargo-fix.1
+1 −2 src/etc/man/cargo-install.1
+1 −2 src/etc/man/cargo-package.1
+1 −2 src/etc/man/cargo-publish.1
+1 −2 src/etc/man/cargo-run.1
+1 −2 src/etc/man/cargo-rustc.1
+1 −2 src/etc/man/cargo-rustdoc.1
+1 −2 src/etc/man/cargo-test.1
+2,077 −0 tests/testsuite/artifact_dep.rs
+2 −0 tests/testsuite/bench.rs
+164 −0 tests/testsuite/build.rs
+37 −0 tests/testsuite/check.rs
+1 −0 tests/testsuite/features2.rs
+4 −0 tests/testsuite/freshness.rs
+1 −0 tests/testsuite/lto.rs
+1 −0 tests/testsuite/main.rs
+2 −0 tests/testsuite/messages.rs
+904 −16 tests/testsuite/metadata.rs
+11 −3 tests/testsuite/profile_config.rs
+39 −0 tests/testsuite/profiles.rs
+10 −0 tests/testsuite/rustflags.rs
+43 −0 tests/testsuite/test.rs

0 comments on commit c651ba8

Please sign in to comment.