Fix cargo update with unused patch.
#8243
Conversation
|
(rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
Note: The error points to #4678. It may be possible that some of the reports in that issue are due to this, though it is unclear. |
|
@bors: r+ Nah this makes sense to me, this mirrors where other packages are ignored but unused patches aren't part of iteration so it makes sense to include them there to. #4678 is a super old issue at this point and I still run into it every now and then, so I'm not sure if it fixes it. If I don't see it for awhile seems worthwhile to close it though! |
|
📌 Commit 501e580 has been approved by |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-azure |
|
I think the error message still shows up if you run I probably should have addressed that as well, but I was a little unclear what scenarios hit that error. I'll try to follow up with another PR to try to improve the error message. |
Update cargo 9 commits in cb06cb2696df2567ce06d1a39b1b40612a29f853..500b2bd01c958f5a33b6aa3f080bea015877b83c 2020-05-08 21:57:44 +0000 to 2020-05-18 17:12:54 +0000 - Handle LTO with an rlib/cdylib crate type (rust-lang/cargo#8254) - Gracefully handle errors during a build. (rust-lang/cargo#8247) - Update `im-rc` to 15.0.0 (rust-lang/cargo#8255) - Fix `cargo update` with unused patch. (rust-lang/cargo#8243) - Rephrased error message for disallowed sections in virtual workspace (rust-lang/cargo#8200) - Ignore broken console output in some situations. (rust-lang/cargo#8236) - Expand error message to explain that a string was found (rust-lang/cargo#8235) - Add context to some fs errors. (rust-lang/cargo#8232) - Move SipHasher to an isolated module. (rust-lang/cargo#8233)
Provide better error messages for a bad `patch`. This attempts to provide more user-friendly error messages for some situations with a bad `patch`. This is a follow-up to #8243. I think this more or less covers all the issues from #4678. I imagine there are other corner cases, but those will need to wait for another day. The main one I can think of is when the patch location is missing required features. Today you get a "blah was not used in the crate graph." warning, with some suggestions added in #6470, but it doesn't actually check if there is a feature mismatch. Closes #4678
|
Thanks for fixing this! |
If you end up with an unused patch in
Cargo.lock, then you try to update the patch to a version that does not match the original unused patch, and runcargo update, Cargo refuses to update it with the error "patch forbarinhttps://github.com/rust-lang/crates.io-indexdid not resolve to any crates". At this point, Cargo seems to be permanently stuck with no way to update it (unless you manually editCargo.lock).The solution here is to add the unused patches to the "to_avoid" list, so that
cargo updateis allowed to update them.I am uncertain if this is the best way to fix it, but seems to match my intuition of how
cargo updateis implemented.