modernize --fix

thaJeztah · thaJeztah · commit 01651306b816 · 2026-03-26T20:46:43.000+01:00
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/platforms.go b/platforms.go
@@ -372,18 +372,19 @@ func FormatAll(platform specs.Platform) string {
 		return "unknown"
 	}
 
-	osOptions := encodeOSOption(platform.OSVersion)
+	var b strings.Builder
+	b.WriteString(encodeOSOption(platform.OSVersion))
 	features := platform.OSFeatures
 	if !slices.IsSorted(features) {
 		features = slices.Clone(features)
 		slices.Sort(features)
 	}
 	for _, f := range features {
-		osOptions += "+" + encodeOSOption(f)
+		b.WriteString("+" + encodeOSOption(f))
 	}
-	if osOptions != "" {
-		OSAndVersion := fmt.Sprintf("%s(%s)", platform.OS, osOptions)
-		return path.Join(OSAndVersion, platform.Architecture, platform.Variant)
+	if b.Len() > 0 {
+		osAndVersion := platform.OS + "(" + b.String() + ")"
+		return path.Join(osAndVersion, platform.Architecture, platform.Variant)
 	}
 	return path.Join(platform.OS, platform.Architecture, platform.Variant)
 }
diff --git a/platforms_test.go b/platforms_test.go
@@ -633,7 +633,7 @@ func BenchmarkParseOSOptions(b *testing.B) {
 	b.ResetTimer()
 	for _, bm := range benchmarks {
 		b.Run(bm.doc, func(b *testing.B) {
-			for i := 0; i < b.N; i++ {
+			for range b.N {
 				_, _ = Parse(bm.input)
 			}
 		})
@@ -668,7 +668,7 @@ func BenchmarkFormatAllOSFeatures(b *testing.B) {
 			platform: specs.Platform{
 				OS: "linux",
 				OSFeatures: func() (out []string) {
-					for i := 0; i <= maxFeatures; i++ {
+					for range maxFeatures {
 						out = append(out, "feature")
 					}
 					return out
@@ -725,7 +725,7 @@ func BenchmarkFormatAllOSFeatures(b *testing.B) {
 	b.ResetTimer()
 	for _, bm := range benchmarks {
 		b.Run(bm.doc, func(b *testing.B) {
-			for i := 0; i < b.N; i++ {
+			for range b.N {
 				_ = FormatAll(bm.platform)
 			}
 		})

Original file line number	Diff line number	Diff line change
`@@ -372,18 +372,19 @@ func FormatAll(platform specs.Platform) string {`
`372`	`372`	`return "unknown"`
`373`	`373`	`}`
`374`	`374`
`375`		`- osOptions := encodeOSOption(platform.OSVersion)`
	`375`	`+ var b strings.Builder`
	`376`	`+ b.WriteString(encodeOSOption(platform.OSVersion))`
`376`	`377`	`features := platform.OSFeatures`
`377`	`378`	`if !slices.IsSorted(features) {`
`378`	`379`	`features = slices.Clone(features)`
`379`	`380`	`slices.Sort(features)`
`380`	`381`	`}`
`381`	`382`	`for _, f := range features {`
`382`		`- osOptions += "+" + encodeOSOption(f)`
	`383`	`+ b.WriteString("+" + encodeOSOption(f))`
`383`	`384`	`}`
`384`		`- if osOptions != "" {`
`385`		`- OSAndVersion := fmt.Sprintf("%s(%s)", platform.OS, osOptions)`
`386`		`- return path.Join(OSAndVersion, platform.Architecture, platform.Variant)`
	`385`	`+ if b.Len() > 0 {`
	`386`	`+ osAndVersion := platform.OS + "(" + b.String() + ")"`
	`387`	`+ return path.Join(osAndVersion, platform.Architecture, platform.Variant)`
`387`	`388`	`}`
`388`	`389`	`return path.Join(platform.OS, platform.Architecture, platform.Variant)`
`389`	`390`	`}`