mirrors/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-13 14:32:26 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

semver: run v fmt (#7439)

Browse source
This commit is contained in:
zakuro 2020-12-22 04:25:19 +09:00 • committed by GitHub
parent 805ec8e177
commit fade162471
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

36
vlib/semver/range.v
View file

@ -61,14 +61,10 @@ fn parse_range(input string) ?Range {
mut comparator_sets := []ComparatorSet{}
for raw_comp_set in raw_comparator_sets {
if can_expand(raw_comp_set) {
s := expand_comparator_set(raw_comp_set) or {
return error(err)
}
s := expand_comparator_set(raw_comp_set) or { return error(err) }
comparator_sets << s
} else {
s := parse_comparator_set(raw_comp_set) or {
return error(err)
}
s := parse_comparator_set(raw_comp_set) or { return error(err) }
comparator_sets << s
}
}
@ -82,9 +78,7 @@ fn parse_comparator_set(input string) ?ComparatorSet {
}
mut comparators := []Comparator{}
for raw_comp in raw_comparators {
c := parse_comparator(raw_comp) or {
return error('Invalid comparator: $raw_comp')
}
c := parse_comparator(raw_comp) or { return error('Invalid comparator: $raw_comp') }
comparators << c
}
return ComparatorSet{comparators}
@ -110,9 +104,7 @@ fn parse_comparator(input string) ?Comparator {
} else {
raw_version = input
}
version := coerce_version(raw_version) or {
return none
}
version := coerce_version(raw_version) or { return none }
return Comparator{version, op}
}
@ -162,9 +154,7 @@ fn expand_comparator_set(input string) ?ComparatorSet {
}
fn expand_tilda(raw_version string) ?ComparatorSet {
min_ver := coerce_version(raw_version) or {
return none
}
min_ver := coerce_version(raw_version) or { return none }
mut max_ver := min_ver
if min_ver.minor == 0 && min_ver.patch == 0 {
max_ver = min_ver.increment(.major)
@ -175,9 +165,7 @@ fn expand_tilda(raw_version string) ?ComparatorSet {
}
fn expand_caret(raw_version string) ?ComparatorSet {
min_ver := coerce_version(raw_version) or {
return none
}
min_ver := coerce_version(raw_version) or { return none }
mut max_ver := min_ver
if min_ver.major == 0 {
max_ver = min_ver.increment(.minor)
@ -192,16 +180,12 @@ fn expand_hyphen(raw_range string) ?ComparatorSet {
if raw_versions.len != 2 {
return none
}
min_ver := coerce_version(raw_versions[0]) or {
return none
}
min_ver := coerce_version(raw_versions[0]) or { return none }
raw_max_ver := parse(raw_versions[1])
if raw_max_ver.is_missing(ver_major) {
return none
}
mut max_ver := raw_max_ver.coerce() or {
return none
}
mut max_ver := raw_max_ver.coerce() or { return none }
if raw_max_ver.is_missing(ver_minor) {
max_ver = max_ver.increment(.minor)
return make_comparator_set_ge_lt(min_ver, max_ver)
@ -210,9 +194,7 @@ fn expand_hyphen(raw_range string) ?ComparatorSet {
}
fn expand_xrange(raw_range string) ?ComparatorSet {
min_ver := parse_xrange(raw_range) or {
return none
}
min_ver := parse_xrange(raw_range) or { return none }
if min_ver.major == 0 {
comparators := [
Comparator{min_ver, Operator.ge},