Skip to content

Commit dc05094

Browse files
authored
Merge pull request #269 from mattfarina/lowercase-error-strings
Updating the error message handling
2 parents 9760c47 + a2cd9c2 commit dc05094

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

constraints.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ func parseConstraint(c string) (*constraint, error) {
288288

289289
// The constraintRegex should catch any regex parsing errors. So,
290290
// we should never get here.
291-
return nil, errors.New("constraint Parser Error")
291+
return nil, errors.New("constraint parser error")
292292
}
293293

294294
cs.con = con
@@ -306,7 +306,7 @@ func parseConstraint(c string) (*constraint, error) {
306306

307307
// The constraintRegex should catch any regex parsing errors. So,
308308
// we should never get here.
309-
return nil, errors.New("constraint Parser Error")
309+
return nil, errors.New("constraint parser error")
310310
}
311311

312312
cs := &constraint{

version.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,24 @@ var DetailedNewVersionErrors = true
3030
var (
3131
// ErrInvalidSemVer is returned a version is found to be invalid when
3232
// being parsed.
33-
ErrInvalidSemVer = errors.New("Invalid Semantic Version")
33+
ErrInvalidSemVer = errors.New("invalid semantic version")
3434

3535
// ErrEmptyString is returned when an empty string is passed in for parsing.
36-
ErrEmptyString = errors.New("Version string empty")
36+
ErrEmptyString = errors.New("version string empty")
3737

3838
// ErrInvalidCharacters is returned when invalid characters are found as
3939
// part of a version
40-
ErrInvalidCharacters = errors.New("Invalid characters in version")
40+
ErrInvalidCharacters = errors.New("invalid characters in version")
4141

4242
// ErrSegmentStartsZero is returned when a version segment starts with 0.
4343
// This is invalid in SemVer.
44-
ErrSegmentStartsZero = errors.New("Version segment starts with 0")
44+
ErrSegmentStartsZero = errors.New("version segment starts with 0")
4545

4646
// ErrInvalidMetadata is returned when the metadata is an invalid format
47-
ErrInvalidMetadata = errors.New("Invalid Metadata string")
47+
ErrInvalidMetadata = errors.New("invalid metadata string")
4848

4949
// ErrInvalidPrerelease is returned when the pre-release is an invalid format
50-
ErrInvalidPrerelease = errors.New("Invalid Prerelease string")
50+
ErrInvalidPrerelease = errors.New("invalid prerelease string")
5151
)
5252

5353
// semVerRegex is the regular expression used to parse a semantic version.
@@ -194,13 +194,13 @@ func NewVersion(v string) (*Version, error) {
194194
var err error
195195
sv.major, err = strconv.ParseUint(m[1], 10, 64)
196196
if err != nil {
197-
return nil, fmt.Errorf("Error parsing version segment: %s", err)
197+
return nil, fmt.Errorf("error parsing version segment: %w", err)
198198
}
199199

200200
if m[2] != "" {
201201
sv.minor, err = strconv.ParseUint(m[2], 10, 64)
202202
if err != nil {
203-
return nil, fmt.Errorf("Error parsing version segment: %s", err)
203+
return nil, fmt.Errorf("error parsing version segment: %w", err)
204204
}
205205
} else {
206206
sv.minor = 0
@@ -209,7 +209,7 @@ func NewVersion(v string) (*Version, error) {
209209
if m[3] != "" {
210210
sv.patch, err = strconv.ParseUint(m[3], 10, 64)
211211
if err != nil {
212-
return nil, fmt.Errorf("Error parsing version segment: %s", err)
212+
return nil, fmt.Errorf("error parsing version segment: %w", err)
213213
}
214214
} else {
215215
sv.patch = 0
@@ -248,13 +248,13 @@ func coerceNewVersion(v string) (*Version, error) {
248248
var err error
249249
sv.major, err = strconv.ParseUint(m[1], 10, 64)
250250
if err != nil {
251-
return nil, fmt.Errorf("Error parsing version segment: %s", err)
251+
return nil, fmt.Errorf("error parsing version segment: %w", err)
252252
}
253253

254254
if m[2] != "" {
255255
sv.minor, err = strconv.ParseUint(strings.TrimPrefix(m[2], "."), 10, 64)
256256
if err != nil {
257-
return nil, fmt.Errorf("Error parsing version segment: %s", err)
257+
return nil, fmt.Errorf("error parsing version segment: %w", err)
258258
}
259259
} else {
260260
sv.minor = 0
@@ -263,7 +263,7 @@ func coerceNewVersion(v string) (*Version, error) {
263263
if m[3] != "" {
264264
sv.patch, err = strconv.ParseUint(strings.TrimPrefix(m[3], "."), 10, 64)
265265
if err != nil {
266-
return nil, fmt.Errorf("Error parsing version segment: %s", err)
266+
return nil, fmt.Errorf("error parsing version segment: %w", err)
267267
}
268268
} else {
269269
sv.patch = 0
@@ -707,7 +707,7 @@ func validatePrerelease(p string) error {
707707
eparts := strings.Split(p, ".")
708708
for _, p := range eparts {
709709
if p == "" {
710-
return ErrInvalidMetadata
710+
return ErrInvalidPrerelease
711711
} else if containsOnly(p, num) {
712712
if len(p) > 1 && p[0] == '0' {
713713
return ErrSegmentStartsZero
@@ -746,7 +746,7 @@ func validateVersion(m []string) error {
746746
}
747747
_, err = strconv.ParseUint(m[1], 10, 64)
748748
if err != nil {
749-
return fmt.Errorf("Error parsing version segment: %s", err)
749+
return fmt.Errorf("error parsing version segment: %w", err)
750750
}
751751
}
752752

@@ -757,7 +757,7 @@ func validateVersion(m []string) error {
757757
}
758758
_, err = strconv.ParseUint(v, 10, 64)
759759
if err != nil {
760-
return fmt.Errorf("Error parsing version segment: %s", err)
760+
return fmt.Errorf("error parsing version segment: %w", err)
761761
}
762762
}
763763

@@ -768,7 +768,7 @@ func validateVersion(m []string) error {
768768
}
769769
_, err = strconv.ParseUint(v, 10, 64)
770770
if err != nil {
771-
return fmt.Errorf("Error parsing version segment: %s", err)
771+
return fmt.Errorf("error parsing version segment: %w", err)
772772
}
773773
}
774774

0 commit comments

Comments
 (0)