Skip to content

Commit cc65e1a

Browse files
committed
Auto merge of rust-lang#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)
2 parents e2b52ff + bffa751 commit cc65e1a

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

Cargo.lock

-2
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,6 @@ dependencies = [
333333
"cargo-util",
334334
"clap",
335335
"crates-io",
336-
"crossbeam-utils",
337336
"curl",
338337
"curl-sys",
339338
"env_logger 0.9.0",
@@ -357,7 +356,6 @@ dependencies = [
357356
"libgit2-sys",
358357
"log",
359358
"memchr",
360-
"num_cpus",
361359
"opener",
362360
"openssl",
363361
"os_info",

src/tools/cargo

Submodule cargo updated 49 files

0 commit comments

Comments
 (0)