mirror of
https://github.com/vlang/v.git
synced 2023-08-10 21:13:21 +03:00
fmt: smarter if condition wrapping (#8201)
This commit is contained in:
@@ -8,8 +8,8 @@ fn version_satisfies(ver Version, input string) bool {
|
||||
}
|
||||
|
||||
fn compare_eq(v1 Version, v2 Version) bool {
|
||||
return v1.major == v2.major &&
|
||||
v1.minor == v2.minor && v1.patch == v2.patch && v1.prerelease == v2.prerelease
|
||||
return v1.major == v2.major && v1.minor == v2.minor && v1.patch == v2.patch
|
||||
&& v1.prerelease == v2.prerelease
|
||||
}
|
||||
|
||||
fn compare_gt(v1 Version, v2 Version) bool {
|
||||
|
||||
@@ -43,8 +43,9 @@ fn (ver RawVersion) is_valid() bool {
|
||||
if ver.raw_ints.len != 3 {
|
||||
return false
|
||||
}
|
||||
return is_valid_number(ver.raw_ints[ver_major]) && is_valid_number(ver.raw_ints[ver_minor]) &&
|
||||
is_valid_number(ver.raw_ints[ver_patch]) && is_valid_string(ver.prerelease) && is_valid_string(ver.metadata)
|
||||
return is_valid_number(ver.raw_ints[ver_major]) && is_valid_number(ver.raw_ints[ver_minor])
|
||||
&& is_valid_number(ver.raw_ints[ver_patch]) && is_valid_string(ver.prerelease)
|
||||
&& is_valid_string(ver.metadata)
|
||||
}
|
||||
|
||||
fn (ver RawVersion) is_missing(typ int) bool {
|
||||
|
||||
@@ -139,8 +139,8 @@ fn parse_xrange(input string) ?Version {
|
||||
}
|
||||
|
||||
fn can_expand(input string) bool {
|
||||
return input[0] == `~` ||
|
||||
input[0] == `^` || input.contains(hyphen_range_sep) || input.index_any(x_range_symbols) > -1
|
||||
return input[0] == `~` || input[0] == `^` || input.contains(hyphen_range_sep)
|
||||
|| input.index_any(x_range_symbols) > -1
|
||||
}
|
||||
|
||||
fn expand_comparator_set(input string) ?ComparatorSet {
|
||||
|
||||
Reference in New Issue
Block a user