refactor(semantic): remove always-nil error returns

Author: G-Rath

semantic/parse.go

@@ -46,33 +46,33 @@ func Parse(str string, ecosystem string) (Version, error) {
 	case "Alpine":
 		return parseAlpineVersion(str)
 	case "ConanCenter":
-		return parseSemverVersion(str)
+		return parseSemverVersion(str), nil
 	case "CRAN":
-		return parseCRANVersion(str)
+		return parseCRANVersion(str), nil
 	case "crates.io":
-		return parseSemverVersion(str)
+		return parseSemverVersion(str), nil
 	case "Debian":
 		return parseDebianVersion(str)
 	case "Go":
-		return parseSemverVersion(str)
+		return parseSemverVersion(str), nil
 	case "Hex":
-		return parseSemverVersion(str)
+		return parseSemverVersion(str), nil
 	case "Maven":
-		return parseMavenVersion(str)
+		return parseMavenVersion(str), nil
 	case "npm":
-		return parseSemverVersion(str)
+		return parseSemverVersion(str), nil
 	case "NuGet":
-		return parseNuGetVersion(str)
+		return parseNuGetVersion(str), nil
 	case "Packagist":
-		return parsePackagistVersion(str)
+		return parsePackagistVersion(str), nil
 	case "Pub":
-		return parseSemverVersion(str)
+		return parseSemverVersion(str), nil
 	case "PyPI":
 		return parsePyPIVersion(str)
 	case "Red Hat":
-		return parseRedHatVersion(str)
+		return parseRedHatVersion(str), nil
 	case "RubyGems":
-		return parseRubyGemsVersion(str)
+		return parseRubyGemsVersion(str), nil
 	case "Ubuntu":
 		return parseDebianVersion(str)
 	}

semantic/version-cran.go

@@ -49,16 +49,10 @@ func (v cranVersion) compare(w cranVersion) int {
 }
 
 func (v cranVersion) CompareStr(str string) (int, error) {
-	w, err := parseCRANVersion(str)
-
-	if err != nil {
-		return 0, err
-	}
-
-	return v.compare(w), nil
+	return v.compare(parseCRANVersion(str)), nil
 }
 
-func parseCRANVersion(str string) (cranVersion, error) {
+func parseCRANVersion(str string) cranVersion {
 	// dashes and periods have the same weight, so we can just normalize to periods
 	parts := strings.Split(strings.ReplaceAll(str, "-", "."), ".")
 
@@ -70,5 +64,5 @@ func parseCRANVersion(str string) (cranVersion, error) {
 		comps = append(comps, v)
 	}
 
-	return cranVersion{comps}, nil
+	return cranVersion{comps}
 }

semantic/version-maven.go

@@ -359,15 +359,9 @@ func (mv mavenVersion) compare(w mavenVersion) (int, error) {
 }
 
 func (mv mavenVersion) CompareStr(str string) (int, error) {
-	mw, err := parseMavenVersion(str)
-
-	if err != nil {
-		return 0, err
-	}
-
-	return mv.compare(mw)
+	return mv.compare(parseMavenVersion(str))
 }
 
-func parseMavenVersion(str string) (mavenVersion, error) {
-	return newMavenVersion(str), nil
+func parseMavenVersion(str string) mavenVersion {
+	return newMavenVersion(str)
 }

semantic/version-nuget.go

@@ -29,15 +29,9 @@ func (v nuGetVersion) compare(w nuGetVersion) int {
 }
 
 func (v nuGetVersion) CompareStr(str string) (int, error) {
-	w, err := parseNuGetVersion(str)
-
-	if err != nil {
-		return 0, err
-	}
-
-	return v.compare(w), nil
+	return v.compare(parseNuGetVersion(str)), nil
 }
 
-func parseNuGetVersion(str string) (nuGetVersion, error) {
-	return nuGetVersion{parseSemverLikeVersion(str, 4)}, nil
+func parseNuGetVersion(str string) nuGetVersion {
+	return nuGetVersion{parseSemverLikeVersion(str, 4)}
 }

semantic/version-packagist.go

@@ -128,23 +128,17 @@ type packagistVersion struct {
 	Components []string
 }
 
-func parsePackagistVersion(str string) (packagistVersion, error) {
+func parsePackagistVersion(str string) packagistVersion {
 	return packagistVersion{
 		str,
 		strings.Split(canonicalizePackagistVersion(str), "."),
-	}, nil
+	}
 }
 
 func (v packagistVersion) compare(w packagistVersion) int {
 	return comparePackagistComponents(v.Components, w.Components)
 }
 
 func (v packagistVersion) CompareStr(str string) (int, error) {
-	w, err := parsePackagistVersion(str)
-
-	if err != nil {
-		return 0, err
-	}
-
-	return v.compare(w), nil
+	return v.compare(parsePackagistVersion(str)), nil
 }

semantic/version-redhat.go

@@ -203,13 +203,7 @@ func (v redHatVersion) compare(w redHatVersion) int {
 }
 
 func (v redHatVersion) CompareStr(str string) (int, error) {
-	w, err := parseRedHatVersion(str)
-
-	if err != nil {
-		return 0, err
-	}
-
-	return v.compare(w), nil
+	return v.compare(parseRedHatVersion(str)), nil
 }
 
 // parseRedHatVersion parses a Red Hat version into a redHatVersion struct.
@@ -223,7 +217,7 @@ func (v redHatVersion) CompareStr(str string) (int, error) {
 //
 // When all components are present, the version is represented as "n-e:v-r.a",
 // though only the version is actually required.
-func parseRedHatVersion(str string) (redHatVersion, error) {
+func parseRedHatVersion(str string) redHatVersion {
 	bf, af, hasColon := strings.Cut(str, ":")
 
 	if !hasColon {
@@ -247,5 +241,5 @@ func parseRedHatVersion(str string) (redHatVersion, error) {
 		epoch = "0"
 	}
 
-	return redHatVersion{epoch, version, release}, nil
+	return redHatVersion{epoch, version, release}
 }

semantic/version-rubygems.go

@@ -119,23 +119,17 @@ type rubyGemsVersion struct {
 	Segments []string
 }
 
-func parseRubyGemsVersion(str string) (rubyGemsVersion, error) {
+func parseRubyGemsVersion(str string) rubyGemsVersion {
 	return rubyGemsVersion{
 		str,
 		canonicalSegments(strings.Split(canonicalizeRubyGemVersion(str), ".")),
-	}, nil
+	}
 }
 
 func (v rubyGemsVersion) compare(w rubyGemsVersion) int {
 	return compareRubyGemsComponents(v.Segments, w.Segments)
 }
 
 func (v rubyGemsVersion) CompareStr(str string) (int, error) {
-	w, err := parseRubyGemsVersion(str)
-
-	if err != nil {
-		return 0, err
-	}
-
-	return v.compare(w), nil
+	return v.compare(parseRubyGemsVersion(str)), nil
 }

semantic/version-semver.go

@@ -100,8 +100,8 @@ type semverVersion struct {
 	semverLikeVersion
 }
 
-func parseSemverVersion(str string) (semverVersion, error) {
-	return semverVersion{parseSemverLikeVersion(str, 3)}, nil
+func parseSemverVersion(str string) semverVersion {
+	return semverVersion{parseSemverLikeVersion(str, 3)}
 }
 
 func (v semverVersion) compare(w semverVersion) int {
@@ -113,11 +113,5 @@ func (v semverVersion) compare(w semverVersion) int {
 }
 
 func (v semverVersion) CompareStr(str string) (int, error) {
-	w, err := parseSemverVersion(str)
-
-	if err != nil {
-		return 0, err
-	}
-
-	return v.compare(w), nil
+	return v.compare(parseSemverVersion(str)), nil
 }