mike/gotest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rename some version variables to more conventional names

Browse Source
This commit is contained in:
Mike Bloy 2019-08-25 09:28:08 -05:00
parent 33e2e45346
commit cd146dc643
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
version/version.go
View File

@ -17,20 +17,20 @@ type Info struct {
} }
// Equal compares two Info structs for equality // Equal compares two Info structs for equality
func (t Info) Equal(o Info) bool { func (i Info) Equal(o Info) bool {
if t.Major != o.Major || t.Minor != o.Minor || t.Patch != o.Patch { if i.Major != o.Major || i.Minor != o.Minor || i.Patch != o.Patch {
return false return false
} }
if len(t.Prerelease) != len(o.Prerelease) || len(t.BuildInfo) != len(o.BuildInfo) { if len(i.Prerelease) != len(o.Prerelease) || len(i.BuildInfo) != len(o.BuildInfo) {
return false return false
} }
for i := 0; i < len(t.Prerelease); i++ { for j := 0; j < len(i.Prerelease); j++ {
if t.Prerelease[i] != o.Prerelease[i] { if i.Prerelease[j] != o.Prerelease[j] {
return false return false
} }
} }
for i := 0; i < len(t.BuildInfo); i++ { for j := 0; j < len(i.BuildInfo); j++ {
if t.BuildInfo[i] != o.BuildInfo[i] { if i.BuildInfo[j] != o.BuildInfo[j] {
return false return false
} }
} }
@ -38,19 +38,19 @@ func (t Info) Equal(o Info) bool {
} }
// String returns a human friendly version string // String returns a human friendly version string
func (t Info) String() string { func (i Info) String() string {
var b strings.Builder var b strings.Builder
fmt.Fprintf(&b, "v%d.%d.%d", t.Major, t.Minor, t.Patch) fmt.Fprintf(&b, "v%d.%d.%d", i.Major, i.Minor, i.Patch)
if len(t.Prerelease) > 0 { if len(i.Prerelease) > 0 {
fmt.Fprintf(&b, "-%s", strings.Join(t.Prerelease, ".")) fmt.Fprintf(&b, "-%s", strings.Join(i.Prerelease, "."))
} }
if len(t.BuildInfo) > 0 { if len(i.BuildInfo) > 0 {
fmt.Fprintf(&b, "+%s", strings.Join(t.BuildInfo, ".")) fmt.Fprintf(&b, "+%s", strings.Join(i.BuildInfo, "."))
} }
return b.String() return b.String()
} }
/* /* reStr is a regular expression string to parse the output of git describe
Match groups: Match groups:
1. version number (without "v") 1. version number (without "v")