Commit 679c4c7
authored
Rollup merge of rust-lang#78756 - ehuss:update-cargo, r=ehuss
Update cargo
7 commits in becb4c282b8f37469efb8f5beda45a5501f9d367..d5556aeb8405b1fe696adb6e297ad7a1f2989b62
2020-10-28 16:41:55 +0000 to 2020-11-04 22:20:36 +0000
- Implement weak dependency features. (rust-lang/cargo#8818)
- Avoid some extra downloads with new feature resolver. (rust-lang/cargo#8823)
- fix: remove install command `$`, for copying friendly (rust-lang/cargo#8828)
- Bump `anyhow` dependency to `1.0.34` in `crates-io` crate (rust-lang/cargo#8826)
- Normalize SourceID in `cargo metadata`. (rust-lang/cargo#8824)
- vendor: correct the path to cargo config (rust-lang/cargo#8822)
- Make host_root return host.root(), not host.dest() (rust-lang/cargo#8819)2 files changed
+3
-3
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
91 | 91 | | |
92 | 92 | | |
93 | 93 | | |
94 | | - | |
| 94 | + | |
95 | 95 | | |
96 | | - | |
| 96 | + | |
97 | 97 | | |
98 | 98 | | |
99 | 99 | | |
| |||
- crates/crates-io/Cargo.toml+1-1
- src/bin/cargo/cli.rs+1
- src/cargo/core/compiler/context/compilation_files.rs+7-2
- src/cargo/core/compiler/custom_build.rs+1-1
- src/cargo/core/compiler/mod.rs+1-1
- src/cargo/core/features.rs+2
- src/cargo/core/package.rs+13-6
- src/cargo/core/resolver/dep_cache.rs+4
- src/cargo/core/resolver/features.rs+158-51
- src/cargo/core/summary.rs+45-9
- src/cargo/ops/cargo_compile.rs+9
- src/cargo/ops/cargo_output_metadata.rs+18-3
- src/cargo/ops/resolve.rs+1
- src/cargo/ops/tree/graph.rs+5
- src/cargo/ops/tree/mod.rs+2
- src/cargo/ops/vendor.rs+1-1
- src/cargo/sources/registry/index.rs+6-1
- src/cargo/util/toml/mod.rs+2-1
- src/doc/src/getting-started/installation.md+1-1
- src/doc/src/reference/unstable.md+23
- tests/testsuite/dep_info.rs+36
- tests/testsuite/features2.rs+244-2
- tests/testsuite/git.rs+206
- tests/testsuite/main.rs+1
- tests/testsuite/weak_dep_features.rs+566
0 commit comments