Merge pull request #502 from ackama:semantic/avoid-shadowing

PiperOrigin-RevId: 732054367

semantic/compare_test.go

@@ -100,7 +100,7 @@ func runAgainstEcosystemFixture(t *testing.T, ecosystem string, filename string)
 		t.Errorf("%d of %d failed", failed, total)
 	}
 
-	if err := scanner.Err(); err != nil {
+	if err = scanner.Err(); err != nil {
 		t.Fatal(err)
 	}
 }

semantic/version-cran.go

@@ -62,14 +62,13 @@ func parseCRANVersion(str string) (cranVersion, error) {
 	// dashes and periods have the same weight, so we can just normalize to periods
 	parts := strings.Split(strings.ReplaceAll(str, "-", "."), ".")
 
-	// TODO: refactor to avoid shadowing the components type
-	components := make(components, 0, len(parts))
+	comps := make(components, 0, len(parts))
 
 	for _, s := range parts {
 		v, _ := new(big.Int).SetString(s, 10)
 
-		components = append(components, v)
+		comps = append(comps, v)
 	}
 
-	return cranVersion{components}, nil
+	return cranVersion{comps}, nil
 }

semantic/version-pypi.go

@@ -178,8 +178,8 @@ func parsePyPIVersion(str string) (pyPIVersion, error) {
 
 	version.epoch = big.NewInt(0)
 
-	if epoch := match[pypiVersionFinder.SubexpIndex("epoch")]; epoch != "" {
-		epoch, err := convertToBigInt(epoch)
+	if epStr := match[pypiVersionFinder.SubexpIndex("epoch")]; epStr != "" {
+		epoch, err := convertToBigInt(epStr)
 
 		if err != nil {
 			return pyPIVersion{}, err

semantic/version-semver-like.go

@@ -55,20 +55,18 @@ func (v *semverLikeVersion) fetchComponentsAndBuild(maxComponents int) (componen
 func parseSemverLikeVersion(line string, maxComponents int) semverLikeVersion {
 	v := parseSemverLike(line)
 
-	// TODO: refactor to avoid shadowing the components type
-	components, build := v.fetchComponentsAndBuild(maxComponents)
+	comps, build := v.fetchComponentsAndBuild(maxComponents)
 
 	return semverLikeVersion{
 		LeadingV:   v.LeadingV,
-		Components: components,
+		Components: comps,
 		Build:      build,
 		Original:   v.Original,
 	}
 }
 
 func parseSemverLike(line string) semverLikeVersion {
-	// TODO: refactor to avoid shadowing the components type
-	var components []*big.Int
+	var comps []*big.Int
 	originStr := line
 
 	currentCom := ""
@@ -104,7 +102,7 @@ func parseSemverLike(line string) semverLikeVersion {
 		if currentCom != "" {
 			v, _ := new(big.Int).SetString(currentCom, 10)
 
-			components = append(components, v)
+			comps = append(comps, v)
 			currentCom = ""
 		}
 
@@ -124,13 +122,13 @@ func parseSemverLike(line string) semverLikeVersion {
 	if !foundBuild && currentCom != "" {
 		v, _ := new(big.Int).SetString(currentCom, 10)
 
-		components = append(components, v)
+		comps = append(comps, v)
 		currentCom = ""
 	}
 
 	return semverLikeVersion{
 		LeadingV:   leadingV,
-		Components: components,
+		Components: comps,
 		Build:      currentCom,
 		Original:   originStr,
 	}