mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

vfmt: change all '$expr' to '${expr}' (#16428)

Browse Source
This commit is contained in:
yuyi
2022-11-15 21:53:13 +08:00
committed by GitHub
parent 56239b4a23
commit 017ace6ea7
859 changed files with 7156 additions and 7135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vlib/semver/parse.v
View File

@@ -56,7 +56,7 @@ fn (ver RawVersion) is_missing(typ int) bool {
fn (raw_ver RawVersion) coerce() ?Version {
ver := raw_ver.complete()
if !is_valid_number(ver.raw_ints[semver.ver_major]) {
return error('Invalid major version: $ver.raw_ints[ver_major]')
return error('Invalid major version: ${ver.raw_ints}[ver_major]')
}
return ver.to_version()
}

4
vlib/semver/range.v
View File

@@ -88,14 +88,14 @@ fn parse_comparator_set(input string) ?ComparatorSet {
raw_comparators := input.split(semver.comparator_sep)
if raw_comparators.len > 2 {
return &InvalidComparatorFormatError{
msg: 'Invalid format of comparator set for input "$input"'
msg: 'Invalid format of comparator set for input "${input}"'
}
}
mut comparators := []Comparator{}
for raw_comp in raw_comparators {
c := parse_comparator(raw_comp) or {
return &InvalidComparatorFormatError{
msg: 'Invalid comparator "$raw_comp" in input "$input"'
msg: 'Invalid comparator "${raw_comp}" in input "${input}"'
}
}
comparators << c

10
vlib/semver/semver.v
View File

@@ -33,7 +33,7 @@ struct InvalidVersionFormatError {
}
pub fn (err InvalidVersionFormatError) msg() string {
return 'Invalid version format for input "$err.input"'
return 'Invalid version format for input "${err.input}"'
}
// * Constructor.
@@ -97,12 +97,12 @@ pub fn (v1 Version) le(v2 Version) bool {
// str returns the `string` representation of the `Version`.
pub fn (ver Version) str() string {
common_string := '${ver.major}.${ver.minor}.$ver.patch'
common_string := '${ver.major}.${ver.minor}.${ver.patch}'
prerelease_string := if ver.prerelease.len > 0 { '-$ver.prerelease' } else { '' }
metadata_string := if ver.metadata.len > 0 { '+$ver.metadata' } else { '' }
prerelease_string := if ver.prerelease.len > 0 { '-${ver.prerelease}' } else { '' }
metadata_string := if ver.metadata.len > 0 { '+${ver.metadata}' } else { '' }
return '$common_string$prerelease_string$metadata_string'
return '${common_string}${prerelease_string}${metadata_string}'
}
// * Utilites.

2
vlib/semver/util.v
View File

@@ -10,7 +10,7 @@ fn is_version_valid(input string) bool {
[inline]
fn coerce_version(input string) ?Version {
raw_ver := parse(input)
ver := raw_ver.coerce() or { return error('Invalid version for input "$input"') }
ver := raw_ver.coerce() or { return error('Invalid version for input "${input}"') }
return ver
}