Improve resolver message to include dependency requirements#9827
Improve resolver message to include dependency requirements#9827bors merged 4 commits intorust-lang:masterfrom
Conversation
|
(rust-highfive has picked a reviewer for you, use r? to override) |
|
r? @Eh2406 |
|
Thank you so much! This is very exciting! Handling lock files looking like Why is |
Because it is called after |
|
@bors r+ Thank you! |
|
📌 Commit a5f8bc9 has been approved by |
|
☀️ Test successful - checks-actions |
Update cargo 19 commits in e96bdb0c3d0a418e7fcd7fbd69be08abf830b4bc..f559c109cc79fe413a8535fb620a5a58b3823d94 2021-08-17 22:58:47 +0000 to 2021-08-26 22:54:55 +0000 - Fix test not to rely on `cargo` in PATH. (rust-lang/cargo#9843) - Improve resolver message to include dependency requirements (rust-lang/cargo#9827) - Add hint for cargo metadata in environment section (rust-lang/cargo#9836) - Fix panic with build-std of a proc-macro. (rust-lang/cargo#9834) - Fix typos “a”→“an” (rust-lang/cargo#9821) - Fix typo in git-authentication.md (rust-lang/cargo#9832) - Add some debug logging for `cargo fix` (rust-lang/cargo#9831) - Add documentation about third-party registries. (rust-lang/cargo#9830) - unset the FIX_ENV when executing the real rustc (rust-lang/cargo#9818) - Allow crate download by checksum (rust-lang/cargo#9801) - Emit warning for migrating to unstable edition in stable channel (rust-lang/cargo#9792) - Warning for no lib dependencies (rust-lang/cargo#9771) - Temporarily disable extern-html-root-url test. (rust-lang/cargo#9824) - Move `tmp` test directory. (rust-lang/cargo#9814) - Fix test incorrectly validating CARGO_PKG_LICENSE_FILE. (rust-lang/cargo#9813) - Implement `[future-incompat-report]` config section (rust-lang/cargo#9774) - Bump curl. (rust-lang/cargo#9809) - Determine packages to install prior to installing (rust-lang/cargo#9793) - Show feature resolver differences for dev-dependencies. (rust-lang/cargo#9803)
Resolves #6199.
Thanks for previous efforts: #5452, #6374, #6665, which are great but somehow outdated, so I tweak them and create this PR. This will also be obsolete if we ship pubgrub-rs with cargo in the future 😃 But before that happens, IMO these changes are still helpful.
This PR changes the resolver error message from
cargo/tests/testsuite/build.rs
Lines 1104 to 1106 in 216f915
to
cargo/tests/testsuite/build.rs
Lines 1104 to 1106 in 0afd40b
Also provide different message for different source kinds, such like:
cargo/tests/testsuite/build.rs
Lines 2810 to 2812 in 0afd40b
TODO?
From #5452 (comment), there shall be at least one task left behind:
In this PR,
validate_linksalso faces this issue that a dependency requirement is locked into a precise version=0.1.0.cargo/tests/testsuite/build_script.rs
Lines 1002 to 1004 in a5f8bc9
I am uncertain about how to resolve this. Besides the function
validate_links, is this problem really a thing that may happen? If not, sincevalidate_linksonly handles old validation logic, it may be ok to drop the commit a5f8bc9 and leave it as is.