Commit cc65e1a
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 files changed
+1
-3
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
333 | 333 | | |
334 | 334 | | |
335 | 335 | | |
336 | | - | |
337 | 336 | | |
338 | 337 | | |
339 | 338 | | |
| |||
357 | 356 | | |
358 | 357 | | |
359 | 358 | | |
360 | | - | |
361 | 359 | | |
362 | 360 | | |
363 | 361 | | |
| |||
- Cargo.toml-2
- crates/cargo-test-support/src/lib.rs+1-1
- src/cargo/core/compiler/build_config.rs+10-3
- src/cargo/core/compiler/compilation.rs+1-1
- src/cargo/core/compiler/job_queue.rs+11-12
- src/cargo/core/compiler/timings.rs+5-1
- src/cargo/core/features.rs+9
- src/cargo/core/workspace.rs+6-10
- src/cargo/util/toml/mod.rs+21-2
- src/doc/man/generated_txt/cargo-bench.txt+1-1
- src/doc/man/generated_txt/cargo-build.txt+1-1
- src/doc/man/generated_txt/cargo-check.txt+1-1
- src/doc/man/generated_txt/cargo-doc.txt+1-1
- src/doc/man/generated_txt/cargo-fix.txt+1-1
- src/doc/man/generated_txt/cargo-install.txt+1-1
- src/doc/man/generated_txt/cargo-run.txt+1-1
- src/doc/man/generated_txt/cargo-rustc.txt+1-1
- src/doc/man/generated_txt/cargo-rustdoc.txt+1-1
- src/doc/man/generated_txt/cargo-test.txt+1-1
- src/doc/man/includes/options-message-format.md+1-1
- src/doc/src/commands/cargo-bench.md+1-1
- src/doc/src/commands/cargo-build.md+1-1
- src/doc/src/commands/cargo-check.md+1-1
- src/doc/src/commands/cargo-doc.md+1-1
- src/doc/src/commands/cargo-fix.md+1-1
- src/doc/src/commands/cargo-install.md+1-1
- src/doc/src/commands/cargo-run.md+1-1
- src/doc/src/commands/cargo-rustc.md+1-1
- src/doc/src/commands/cargo-rustdoc.md+1-1
- src/doc/src/commands/cargo-test.md+1-1
- src/doc/src/reference/environment-variables.md+11-4
- src/etc/man/cargo-bench.1+1-1
- src/etc/man/cargo-build.1+1-1
- src/etc/man/cargo-check.1+1-1
- src/etc/man/cargo-doc.1+1-1
- src/etc/man/cargo-fix.1+1-1
- src/etc/man/cargo-install.1+1-1
- src/etc/man/cargo-run.1+1-1
- src/etc/man/cargo-rustc.1+1-1
- src/etc/man/cargo-rustdoc.1+1-1
- src/etc/man/cargo-test.1+1-1
- tests/testsuite/concurrent.rs-2
- tests/testsuite/features_namespaced.rs-2
- tests/testsuite/inheritable_workspace_fields.rs-5
- tests/testsuite/package.rs+30-4
- tests/testsuite/publish.rs-2
- tests/testsuite/tool_paths.rs+1-1
- tests/testsuite/version.rs-1
- tests/testsuite/weak_dep_features.rs-1
0 commit comments