Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/variables/go-versions.env
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
latest=1.23
penultimate=1.22
min=1.17
min=1.22
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

GOLANGCI_LINT_VERSION=v1.60.1
GOLANGCI_LINT_VERSION=v2.11.1

LINTER=./bin/golangci-lint
LINTER_VERSION_FILE=./bin/.golangci-lint-version-$(GOLANGCI_LINT_VERSION)
Expand Down
8 changes: 7 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
module github.com/launchdarkly/go-semver

go 1.13
go 1.22

require github.com/stretchr/testify v1.6.1

require (
github.com/davecgh/go-spew v1.1.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
)
18 changes: 9 additions & 9 deletions parse.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
// ParseMode is an enum-like type used with ParseAs.
type ParseMode int

var invalidSemverError = errors.New("invalid semantic version")
var errInvalidSemver = errors.New("invalid semantic version")

const (
// ParseModeStrict is the default parsing mode, requiring a strictly correct version string with
Expand Down Expand Up @@ -45,46 +45,46 @@ func ParseAs(s string, mode ParseMode) (Version, error) {
if mode == ParseModeAllowMissingMinorAndPatch {
result.major, term, ok = requirePositiveIntegerComponent(&scanner, dotOrHyphenOrPlusTerminator)
if !ok {
return Version{}, invalidSemverError
return Version{}, errInvalidSemver
}
if term == '.' {
result.minor, term, ok = requirePositiveIntegerComponent(&scanner, dotOrHyphenOrPlusTerminator)
if !ok {
return Version{}, invalidSemverError
return Version{}, errInvalidSemver
}
if term == '.' {
result.patch, term, ok = requirePositiveIntegerComponent(&scanner, hyphenOrPlusTerminator)
if !ok {
return Version{}, invalidSemverError
return Version{}, errInvalidSemver
}
}
}
} else {
result.major, term, ok = requirePositiveIntegerComponent(&scanner, dotTerminator)
if !ok || term != '.' {
return Version{}, invalidSemverError
return Version{}, errInvalidSemver
}
result.minor, term, ok = requirePositiveIntegerComponent(&scanner, dotTerminator)
if !ok || term != '.' {
return Version{}, invalidSemverError
return Version{}, errInvalidSemver
}
result.patch, term, ok = requirePositiveIntegerComponent(&scanner, hyphenOrPlusTerminator)
if !ok {
return Version{}, invalidSemverError
return Version{}, errInvalidSemver
}
}

if term == '-' {
result.prerelease, term = scanner.readUntil(plusTerminator)
if result.prerelease == "" || term == scannerNonASCII || !validatePrerelease(result.prerelease) {
return Version{}, invalidSemverError
return Version{}, errInvalidSemver
}
}

if term == '+' {
result.build, term = scanner.readUntil(noTerminator)
if result.build == "" || term == scannerNonASCII || !validateBuild(result.build) {
return Version{}, invalidSemverError
return Version{}, errInvalidSemver
}
}

Expand Down
2 changes: 1 addition & 1 deletion scan.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func (s *simpleASCIIScanner) peek() int8 {
if s.pos >= s.length {
return scannerEOF
}
var ch uint8 = s.source[s.pos]
ch := s.source[s.pos]
if ch == 0 || ch > unicode.MaxASCII {
return scannerNonASCII
}
Expand Down