diff options
| author | bors <bors@rust-lang.org> | 2022-08-12 06:45:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-08-12 06:45:35 +0000 |
| commit | cc65e1a548abee1d664113abd117b79055532ffa (patch) | |
| tree | f0a8b30221069fee825ba8ffc2e84d4cb29e66e5 | |
| parent | e2b52ff73edc8b0b7c74bc28760d618187731fe8 (diff) | |
| parent | bffa751b2f9bc33306bfe75ba690b9fb371e6d72 (diff) | |
| download | rust-cc65e1a548abee1d664113abd117b79055532ffa.tar.gz rust-cc65e1a548abee1d664113abd117b79055532ffa.zip | |
Auto merge of #100435 - ehuss:update-cargo, r=ehuss
Update cargo 8 commits in ce40690a5e4e315d3dab0aae1eae69d0252c52ac..efd4ca3dc0b89929dc8c5f5c023d25978d76cb61 2022-08-09 22:32:17 +0000 to 2022-08-12 01:28:28 +0000 - Use `std::thread::scope` to replace crossbeam (rust-lang/cargo#10977) - [docs] Remove extra "in" from `cargo-test.md` (rust-lang/cargo#10978) - Enable two windows tests (rust-lang/cargo#10930) - Improve error msg for get target runner (rust-lang/cargo#10968) - Ensure rustc-echo-wrapper works with an overridden build.target-dir (rust-lang/cargo#10962) - Switch back to `available_parallelism` (rust-lang/cargo#10969) - Only override published resolver when the workspace is different (rust-lang/cargo#10961) - Add `CARGO_LOG` to "Environment variables Cargo reads" (rust-lang/cargo#10967)
| -rw-r--r-- | Cargo.lock | 2 | ||||
| m--------- | src/tools/cargo | 0 |
2 files changed, 0 insertions, 2 deletions
diff --git a/Cargo.lock b/Cargo.lock index 3dca4aa3c6d..10ebff84887 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -333,7 +333,6 @@ dependencies = [ "cargo-util", "clap", "crates-io", - "crossbeam-utils", "curl", "curl-sys", "env_logger 0.9.0", @@ -357,7 +356,6 @@ dependencies = [ "libgit2-sys", "log", "memchr", - "num_cpus", "opener", "openssl", "os_info", diff --git a/src/tools/cargo b/src/tools/cargo -Subproject ce40690a5e4e315d3dab0aae1eae69d0252c52a +Subproject efd4ca3dc0b89929dc8c5f5c023d25978d76cb6 |