fix(cargo): handle version range using Less Than Equal #9828
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
This was referenced May 24, 2024
Merged
bdragon
approved these changes
May 24, 2024
| @@ -141,7 +141,11 @@ def update_range_requirements(string_reqs) | |||
| raise UnfixableRequirement if req.start_with?(">") | |||
|
|
|||
| req.sub(VERSION_REGEX) do |old_version| | |||
| update_greatest_version(old_version, target_version) | |||
| if req.start_with?("<=") | |||
| version_class.new(target_version) | |||
There was a problem hiding this comment.
Suggested change
| version_class.new(target_version) | |
| target_version |
This branch is returning a Cargo::Version instance, which will be converted to a string with #to_s, which just outputs the version string it was initialized with, so I think this could be simplified.
There was a problem hiding this comment.
That makes sense. Fixed.
| @@ -151,17 +151,34 @@ | |||
| end | |||
|
|
|||
| context "when there were multiple range specifications" do | |||
| let(:req_string) { "> 1.0.0, < 1.2.0" } | |||
| its([:requirement]) { is_expected.to eq("> 1.0.0, < 1.6.0") } | |||
| context "with `less then`" do | |||
There was a problem hiding this comment.
Non-blocking/nitpick: technically less than
| context "when including a pre-release" do | ||
| let(:req_string) { ">=1.2.0, <1.4.0-dev" } | ||
| its([:requirement]) { is_expected.to eq(">=1.2.0, <1.6.0") } | ||
| context "with `less then equal`" do |
There was a problem hiding this comment.
Non-blocking/nitpick: technically less than or equal to
When a version range with a '<' character is found, the range is updated to the (latest version + 1). However for a range using "<=" this is invalid. Add a special case for a range using Less Than Equal which is updated to simply the latest version.
2f03293 to
72f1102
Compare
|
I fixed all comments and resolved the merge conflict. |
5 tasks
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.
When a version range with a '<' character is found, the range is updated to the (latest version + 1). However for a range using "<=" this is invalid. Add a special case for a range using Less Than Equal which is updated to simply the latest version.