Skip to content

Commit b04a39b

Browse files
authored
chore: update var name (googleapis#3969)
Replace `SemVerSpecV1` and `SemVerSpecV2` to `SpecV1` and `SpecV2`, respectively to comply with Go naming convention.
1 parent 804f27a commit b04a39b

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

internal/semver/semver.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ import (
2727
)
2828

2929
const (
30-
// SemVerSpecV2 corresponds to SemVer spec version 2.0.0
31-
// https://semver.org/spec/v2.0.0.html.
32-
SemVerSpecV2 = "2.0.0"
30+
// SpecV1 is the string for Semantic Versioning 1.0.0.
31+
// See https://semver.org/spec/v1.0.0.html.
32+
SpecV1 = "1.0.0"
3333

34-
// SemVerSpecV1 corresponds to SemVer spec version 1.0.0
35-
// https://semver.org/spec/v1.0.0.html.
36-
SemVerSpecV1 = "1.0.0"
34+
// SpecV2 is the string for Semantic Versioning 2.0.0.
35+
// See https://semver.org/spec/v2.0.0.html.
36+
SpecV2 = "2.0.0"
3737
)
3838

3939
// version represents a semantic version.
@@ -98,7 +98,7 @@ func parse(versionString string) (version, error) {
9898

9999
var err error
100100
v := version{
101-
SpecVersion: SemVerSpecV2,
101+
SpecVersion: SpecV2,
102102
}
103103

104104
v.Major, err = strconv.Atoi(vParts[0])
@@ -132,7 +132,7 @@ func parse(versionString string) (version, error) {
132132
} else if matches := semverV1PrereleaseNumberRegexp.FindStringSubmatch(prerelease); len(matches) == 3 {
133133
v.Prerelease = matches[1]
134134
numStr = matches[2]
135-
v.SpecVersion = SemVerSpecV1
135+
v.SpecVersion = SpecV1
136136
} else {
137137
v.Prerelease = prerelease
138138
}
@@ -187,7 +187,7 @@ func (o stringifyOptions) Stringify(v version) string {
187187

188188
if v.PrereleaseNumber != nil {
189189
var numStr string
190-
if v.SpecVersion == SemVerSpecV1 {
190+
if v.SpecVersion == SpecV1 {
191191
numStr = fmt.Sprintf("%02d", *v.PrereleaseNumber)
192192
} else {
193193
numStr = strconv.Itoa(*v.PrereleaseNumber)

internal/semver/semver_test.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func TestParse(t *testing.T) {
3838
Major: 1,
3939
Minor: 2,
4040
Patch: 3,
41-
SpecVersion: SemVerSpecV2,
41+
SpecVersion: SpecV2,
4242
},
4343
},
4444
{
@@ -51,7 +51,7 @@ func TestParse(t *testing.T) {
5151
Prerelease: "alpha",
5252
PrereleaseSeparator: ".",
5353
PrereleaseNumber: ptr(1),
54-
SpecVersion: SemVerSpecV2,
54+
SpecVersion: SpecV2,
5555
},
5656
},
5757
{
@@ -63,7 +63,7 @@ func TestParse(t *testing.T) {
6363
Patch: 3,
6464
Prerelease: "beta",
6565
PrereleaseNumber: ptr(21),
66-
SpecVersion: SemVerSpecV1,
66+
SpecVersion: SpecV1,
6767
},
6868
},
6969
{
@@ -74,7 +74,7 @@ func TestParse(t *testing.T) {
7474
Minor: 2,
7575
Patch: 3,
7676
Prerelease: "beta",
77-
SpecVersion: SemVerSpecV2,
77+
SpecVersion: SpecV2,
7878
},
7979
},
8080
{
@@ -84,7 +84,7 @@ func TestParse(t *testing.T) {
8484
Major: 1,
8585
Minor: 2,
8686
Patch: 0,
87-
SpecVersion: SemVerSpecV2,
87+
SpecVersion: SpecV2,
8888
},
8989
},
9090
{
@@ -96,7 +96,7 @@ func TestParse(t *testing.T) {
9696
Patch: 3,
9797
Prerelease: "alpha",
9898
PrereleaseNumber: ptr(1),
99-
SpecVersion: SemVerSpecV1,
99+
SpecVersion: SpecV1,
100100
},
101101
},
102102
{
@@ -108,7 +108,7 @@ func TestParse(t *testing.T) {
108108
Patch: 3,
109109
Prerelease: "beta",
110110
PrereleaseNumber: ptr(2),
111-
SpecVersion: SemVerSpecV1,
111+
SpecVersion: SpecV1,
112112
},
113113
},
114114
{
@@ -120,7 +120,7 @@ func TestParse(t *testing.T) {
120120
Patch: 3,
121121
Prerelease: "rc",
122122
PrereleaseNumber: ptr(3),
123-
SpecVersion: SemVerSpecV1,
123+
SpecVersion: SpecV1,
124124
},
125125
},
126126
{
@@ -132,7 +132,7 @@ func TestParse(t *testing.T) {
132132
Patch: 3,
133133
Prerelease: "preview",
134134
PrereleaseNumber: ptr(4),
135-
SpecVersion: SemVerSpecV1,
135+
SpecVersion: SpecV1,
136136
},
137137
},
138138
{
@@ -144,7 +144,7 @@ func TestParse(t *testing.T) {
144144
Patch: 3,
145145
Prerelease: "a",
146146
PrereleaseNumber: ptr(5),
147-
SpecVersion: SemVerSpecV1,
147+
SpecVersion: SpecV1,
148148
},
149149
},
150150
{
@@ -156,7 +156,7 @@ func TestParse(t *testing.T) {
156156
Patch: 3,
157157
Prerelease: "b",
158158
PrereleaseNumber: ptr(6),
159-
SpecVersion: SemVerSpecV1,
159+
SpecVersion: SpecV1,
160160
},
161161
},
162162
} {
@@ -298,7 +298,7 @@ func TestVersion_String(t *testing.T) {
298298
Patch: 3,
299299
Prerelease: "beta",
300300
PrereleaseNumber: ptr(21),
301-
SpecVersion: SemVerSpecV1,
301+
SpecVersion: SpecV1,
302302
},
303303
expected: "1.2.3-beta21",
304304
},
@@ -310,7 +310,7 @@ func TestVersion_String(t *testing.T) {
310310
Patch: 3,
311311
Prerelease: "beta",
312312
PrereleaseNumber: ptr(2),
313-
SpecVersion: SemVerSpecV1,
313+
SpecVersion: SpecV1,
314314
},
315315
expected: "1.2.3-beta02",
316316
},

0 commit comments

Comments
 (0)