Commit c4830da
authored
Rollup merge of rust-lang#81245 - ehuss:update-cargo, r=ehuss
Update cargo
5 commits in a73e5b7d567c3036b296fc6b33ed52c5edcd882e..783bc43c660bf39c1e562c8c429b32078ad3099b
2021-01-12 23:45:39 +0000 to 2021-01-20 19:02:26 +0000
- Fix some issues with `cargo doc` and the new feature resolver. (rust-lang/cargo#9077)
- Implement support for rust-version field in project metadata (rust-lang/cargo#8037)
- Fix a bug in Cargo's cyclic dep graph detection (rust-lang/cargo#9075)
- Typo correction: artifcats -> artifacts (rust-lang/cargo#9081)
- Remove stray backtick from doc (rust-lang/cargo#9079)2 files changed
+2
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
427 | 427 | | |
428 | 428 | | |
429 | 429 | | |
| 430 | + | |
430 | 431 | | |
431 | 432 | | |
432 | 433 | | |
| |||
- crates/cargo-test-support/Cargo.toml+1
- crates/cargo-test-support/src/registry.rs+31-2
- src/bin/cargo/commands/bench.rs+1
- src/bin/cargo/commands/build.rs+1
- src/bin/cargo/commands/check.rs+1
- src/bin/cargo/commands/doc.rs+1
- src/bin/cargo/commands/fix.rs+1
- src/bin/cargo/commands/run.rs+1
- src/bin/cargo/commands/rustc.rs+1
- src/bin/cargo/commands/rustdoc.rs+1
- src/bin/cargo/commands/test.rs+1
- src/cargo/core/compiler/context/mod.rs+2-2
- src/cargo/core/compiler/unit_dependencies.rs+10-6
- src/cargo/core/features.rs+14
- src/cargo/core/manifest.rs+7
- src/cargo/core/package.rs+4
- src/cargo/core/resolver/mod.rs+29-31
- src/cargo/ops/cargo_compile.rs+153-1
- src/cargo/ops/cargo_package.rs+1
- src/cargo/util/command_prelude.rs+17
- src/cargo/util/toml/mod.rs+46-4
- src/doc/src/reference/unstable.md+22-3
- tests/testsuite/collisions.rs+271
- tests/testsuite/features2.rs+47
- tests/testsuite/main.rs+1
- tests/testsuite/path.rs+72
- tests/testsuite/rust_version.rs+260
0 commit comments