Refactor version module #3861
Open
Refactor version module #3861
+163
−79
Conversation
This file contains hidden or 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
ksew1
requested review from
MKowalski8 and
franciszekjob
and removed request for
a team
This was referenced Oct 23, 2025
ksew1
force-pushed
the
spr/master/a2fe82e0
branch
from
85c48ae to
bddfb28
Compare
ksew1
force-pushed
the
spr/master/f673da00
branch
from
60b47b3 to
154edfe
Compare
cptartur
reviewed
Oct 24, 2025
crates/scarb-api/src/version.rs
Outdated
| fn extract_versions(version_output: &str) -> Result<HashMap<String, Version>, VersionError> { | ||
| // https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string | ||
| static VERSION_REGEX: LazyLock<Regex> = LazyLock::new(|| { | ||
| Regex::new(r"(?P<tool>\w+)[\s:]+(?P<ver>(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)(?:-(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*)?(?:\+[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*)?)").expect("this should be a valid regex") |
There was a problem hiding this comment.
We don't need to mach unlimited number of whitespace between tool name and it's version, just an optional : and whitespace
Suggested change
| Regex::new(r"(?P<tool>\w+)[\s:]+(?P<ver>(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)(?:-(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*)?(?:\+[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*)?)").expect("this should be a valid regex") | |
| Regex::new(r"(?P<tool>\w+):?\s(?P<ver>(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)(?:-(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*)?(?:\+[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*)?)").expect("this should be a valid regex") |
Also I think if you are already matching for digits, you don't need extra matches for numbers
Suggested change
| Regex::new(r"(?P<tool>\w+)[\s:]+(?P<ver>(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)(?:-(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*)?(?:\+[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*)?)").expect("this should be a valid regex") | |
| Regex::new(r"(?P<tool>\w+)[\s:]+(?P<ver>(?:\d*)\.(?:\d*)\.(?:\d*)(?:-(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*)?(?:\+[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*)?)").expect("this should be a valid regex") |
There was a problem hiding this comment.
The other groups could be simplified as well
Suggested change
| Regex::new(r"(?P<tool>\w+)[\s:]+(?P<ver>(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)(?:-(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*)?(?:\+[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*)?)").expect("this should be a valid regex") | |
| Regex::new(r"(?P<tool>\w+):?\s(?P<ver>(?:\d*)\.(?:\d*)\.(?:\d*)(?:-(?:[0-9a-zA-Z-]+)(?:\.(?:[0-9a-zA-Z-]*))*)?(?:\+[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*)?)").expect("this should be a valid regex") |
| .collect() | ||
| } | ||
| #[cfg(test)] | ||
| mod tests { |
There was a problem hiding this comment.
Shouldn't we add some more tests (even generate them through some LLM) for more versions combinations? As a sanity check for regexes.
ksew1
force-pushed
the
spr/master/a2fe82e0
branch
from
bddfb28 to
b5c96e0
Compare
ksew1
force-pushed
the
spr/master/f673da00
branch
3 times, most recently
from
b91a450 to
d62c883
Compare
github-merge-queue bot
pushed a commit
that referenced
this pull request
Oct 28, 2025
commit-id:e0444c34 --- **Stack**: - #3861 - #3860 - #3859 ⬅⚠️ *Part of a stack created by [spr](https://github.com/ejoffe/spr). Do not merge manually using the UI - doing so may have unexpected results.*
ksew1
force-pushed
the
spr/master/f673da00
branch
from
d62c883 to
c7226bc
Compare
ksew1
force-pushed
the
spr/master/a2fe82e0
branch
from
b5c96e0 to
0e868b9
Compare
github-merge-queue bot
pushed a commit
that referenced
this pull request
Oct 28, 2025
commit-id:a2fe82e0 --- **Stack**: - #3861 - #3860 ⬅⚠️ *Part of a stack created by [spr](https://github.com/ejoffe/spr). Do not merge manually using the UI - doing so may have unexpected results.*
commit-id:f673da00
ksew1
force-pushed
the
spr/master/f673da00
branch
from
c7226bc to
836a1e8
Compare
MKowalski8
reviewed
Oct 29, 2025
Comment on lines
+48
to
+49
| let output = run_command(dir)?; | ||
| parse_output(&output) |
There was a problem hiding this comment.
nit: What would you say to name it like this, or simillar:
Suggested change
| let output = run_command(dir)?; | |
| parse_output(&output) | |
| let output = run_version_command(dir)?; | |
| parse_version_output(&output) |
I know that it is a private function, but it would take away this few seconds to compute, that it is not some generic run_command function 😅
cptartur
approved these changes
Oct 31, 2025
Comment on lines
+48
to
+49
| let output = run_command(dir)?; | ||
| parse_output(&output) |
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.
No description provided.