fix: Consistently compare MSRVs #13537
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
We used several strategies - Relying in `impl Ord for RustVersion` - Converting to version requirements - Decrementing a version This consolidates around one strategy: `RustVersion::is_compatible_with` - Ensure the comparisons have the same behavior - Centralize knowledge of how to handle pre-release rustc - Losslessly allow comparing with either rustc or workspace msrv
|
r? @weihanglo rustbot has assigned @weihanglo. Use r? to explicitly pick a reviewer |
rustbot
added
A-dependency-resolution
rustbot
added
the
A-infrastructure
|
Looks like a good simplification. |
epage
force-pushed
the
msrv-compat
branch
2 times, most recently
from
84810fe
to
134ed93
Compare
|
@bors r+ |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 12, 2024
Update cargo 9 commits in a4c63fe5388beaa09e5f91196c86addab0a03580..7065f0ef4aa267a7455e1c478b5ccacb7baea59c 2024-03-06 22:15:17 +0000 to 2024-03-12 13:25:15 +0000 - chore: remove repetitive word (rust-lang/cargo#13575) - refactor(lockfile): Make diffing/printing more reusable (rust-lang/cargo#13564) - test: Add tests for using worktrees and sparse checkouts (rust-lang/cargo#13567) - util/network/http: Use `cargo/1.2.3` user-agent header (rust-lang/cargo#13548) - fix: Consistently compare MSRVs (rust-lang/cargo#13537) - refactor(shell): Use alternate to close links (rust-lang/cargo#13562) - fix(doc): Collapse down Generated statuses without --verbose (rust-lang/cargo#13557) - doc: Add doc for -Zpublic-dependency (rust-lang/cargo#13556) - docs: add link to the exported_private_dependencies lint (rust-lang/cargo#13547) r? ghost
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.
What does this PR try to resolve?
Currently, we use several strategies to evaluate an MSRV
impl Ord for RustVersion(dep_msrv <= pkg_msrv)This consolidates around one strategy:
RustVersion::is_compatible_withHow should we test and review this PR?
Refactors are split out
I didn't go through and verify if or how the different approaches varied in behavior, instead consolidating on the one, so only unit tests around the consolidated behavior were added rather than trying to hit all of the corner cases within the various ways
RustVersionis used.Additional information