Change diesel compatibility messages #9927
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Diesel 1.4.8 fixes the critical behaviour. This commit changes the corresponding messages for `cargo fix` and normal builds to promt the user to just update the diesel version to fix the corresponding compilation errors.
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @ehuss (or someone else) soon. Please see the contribution instructions for more information. |
rust-highfive
added
the
S-waiting-on-review
ehuss
reviewed
Sep 21, 2021
src/cargo/ops/fix.rs
Outdated
Comment on lines
326
to
336
| if pid.name() != "diesel" { | ||
| return false; | ||
| } | ||
| Comparator { | ||
| op: Op::Less, | ||
| major: 1, | ||
| minor: Some(4), | ||
| patch: Some(8), | ||
| pre: Prerelease::EMPTY, | ||
| } | ||
| .matches(pid.version()) |
There was a problem hiding this comment.
I think this can be simplified a bit by just comparing with a Version:
Suggested change
| if pid.name() != "diesel" { | |
| return false; | |
| } | |
| Comparator { | |
| op: Op::Less, | |
| major: 1, | |
| minor: Some(4), | |
| patch: Some(8), | |
| pre: Prerelease::EMPTY, | |
| } | |
| .matches(pid.version()) | |
| pid.name() == "diesel" && pid.version() < &Version::new(1, 4, 8) |
weiznich
force-pushed
the
diesel_2021_edition
branch
from
ef78977
to
dd03e40
Compare
|
Thanks! I'll take care of backporting this to beta later this week. @bors r+ |
|
📌 Commit dd03e40 has been approved by |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 22, 2021
Update cargo 7 commits in 9a28ac83c9eb73e42ffafac552c0a55f00dbf40c..0121d66aa2ef5ffa9735f86c2b56f5fdc5a837a6 2021-09-18 15:42:28 -0500 to 2021-09-22 16:08:27 +0000 - Implement example completion for zsh (rust-lang/cargo#9939) - Bump curl-sys dependency (rust-lang/cargo#9937) - Add fetch smoke test. (rust-lang/cargo#9921) - Differentiate tests in progress bar. (rust-lang/cargo#9934) - Remove TOML incompatibility hacks (rust-lang/cargo#9932) - Change diesel compatibility messages (rust-lang/cargo#9927) - Remove broken link in contrib docs. (rust-lang/cargo#9928)
|
@ehuss What's the state of the beta backport? |
|
The beta update is waiting to be batched with a curl update, which we wanted to let ride on nightly for a bit to detect any major issues. It will probably happen next week. |
ehuss
pushed a commit
to ehuss/cargo
that referenced
this pull request
Oct 4, 2021
Change diesel compatibility messages Diesel 1.4.8 fixes the critical behaviour. This commit changes the corresponding messages for `cargo fix` and normal builds to prompt the user to just update the diesel version to fix the corresponding compilation errors. As discussed in rust-lang/rust#88903 (comment) Fixes rust-lang/rust#88903 Fixes rust-lang#9450
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Diesel 1.4.8 fixes the critical behaviour. This commit changes the
corresponding messages for
cargo fixand normal builds to prompt theuser to just update the diesel version to fix the corresponding
compilation errors.
As discussed in rust-lang/rust#88903 (comment)
Fixes rust-lang/rust#88903
Fixes #9450