all: Run modernize -fix ./...

Author: bep

helpers.go

@@ -407,7 +407,7 @@ func (c vc) toDegrees(v any) (float64, error) {
 }
 
 func isASCII(s string) bool {
-	for i := 0; i < len(s); i++ {
+	for i := range len(s) {
 		if s[i] > unicode.MaxASCII {
 			return false
 		}

imagemeta.go

@@ -7,6 +7,7 @@ import (
 	"encoding/binary"
 	"fmt"
 	"io"
+	"maps"
 	"math"
 	"os"
 	"strings"
@@ -328,15 +329,9 @@ func (t *Tags) XMP() map[string]TagInfo {
 // All returns all tags in a map.
 func (t Tags) All() map[string]TagInfo {
 	all := make(map[string]TagInfo)
-	for k, v := range t.EXIF() {
-		all[k] = v
-	}
-	for k, v := range t.IPTC() {
-		all[k] = v
-	}
-	for k, v := range t.XMP() {
-		all[k] = v
-	}
+	maps.Copy(all, t.EXIF())
+	maps.Copy(all, t.IPTC())
+	maps.Copy(all, t.XMP())
 	return all
 }
 

imagemeta_test.go

@@ -23,6 +23,7 @@ import (
 
 	qt "github.com/frankban/quicktest"
 	"github.com/google/go-cmp/cmp"
+	"maps"
 )
 
 func TestDecodeAllImageFormats(t *testing.T) {
@@ -213,7 +214,7 @@ func TestDecodeShouldHandleTagEXIF(t *testing.T) {
 
 	const numTagsTotal = 64
 
-	for i := 0; i < 30; i++ {
+	for range 30 {
 		img, close := getSunrise(c, imagemeta.JPEG)
 		c.Cleanup(close)
 
@@ -524,28 +525,16 @@ func assertGoldenInfoTagCount(t testing.TB, filename string, sources imagemeta.S
 	tagsRight := make(map[string]any)
 
 	if sources.Has(imagemeta.EXIF) {
-		for k, v := range tags.EXIF() {
-			tagsLeft[k] = v
-		}
-		for k, v := range goldenInfo.EXIF {
-			tagsRight[k] = v
-		}
+		maps.Copy(tagsLeft, tags.EXIF())
+		maps.Copy(tagsRight, goldenInfo.EXIF)
 	}
 	if sources.Has(imagemeta.IPTC) {
-		for k, v := range tags.IPTC() {
-			tagsLeft[k] = v
-		}
-		for k, v := range goldenInfo.IPTC {
-			tagsRight[k] = v
-		}
+		maps.Copy(tagsLeft, tags.IPTC())
+		maps.Copy(tagsRight, goldenInfo.IPTC)
 	}
 	if sources.Has(imagemeta.XMP) {
-		for k, v := range tags.XMP() {
-			tagsLeft[k] = v
-		}
-		for k, v := range goldenInfo.XMP {
-			tagsRight[k] = v
-		}
+		maps.Copy(tagsLeft, tags.XMP())
+		maps.Copy(tagsRight, goldenInfo.XMP)
 	}
 
 	count := 0
@@ -897,7 +886,7 @@ var eq = qt.CmpEquals(
 			if len(floatStringLeft) != len(floatStringRight) {
 				return false
 			}
-			for i := 0; i < len(floatStringLeft); i++ {
+			for i := range floatStringLeft {
 				left, err := strconv.ParseFloat(floatStringLeft[i], 64)
 				if err != nil {
 					return false
@@ -1082,6 +1071,6 @@ func BenchmarkDecodeCompareWithGoexif(b *testing.B) {
 	})
 }
 
-func panicWarnf(format string, args ...interface{}) {
+func panicWarnf(format string, args ...any) {
 	panic(fmt.Errorf(format, args...))
 }

io.go

@@ -207,7 +207,7 @@ func (e *streamReader) readBytes(b []byte) error {
 func (e *streamReader) readNullTerminatedBytes(max int) ([]byte, int64) {
 	var b []byte
 	var n int64
-	for i := 0; i < max; i++ {
+	for i := range max {
 		b = append(b, e.read1())
 		n++
 		if b[i] == 0 {

metadecoder_exif.go

@@ -7,6 +7,7 @@ import (
 	"encoding/binary"
 	"fmt"
 	"io"
+	"maps"
 	"math"
 	"path"
 	"strings"
@@ -232,7 +233,7 @@ func (e *metaDecoderEXIF) convertValues(typ exifType, count, len int, r io.Reade
 
 	values := make([]any, count)
 	allBytes := true
-	for i := 0; i < count; i++ {
+	for i := range count {
 		v := e.convertValue(typ, r)
 		values[i] = v
 		if allBytes {
@@ -469,7 +470,7 @@ func (e *metaDecoderEXIF) decodeTag(namespace string) error {
 func (e *metaDecoderEXIF) decodeTags(namespace string) error {
 	numTags := e.read2()
 
-	for i := 0; i < int(numTags); i++ {
+	for range int(numTags) {
 		if err := e.decodeTag(namespace); err != nil {
 			return err
 		}
@@ -500,12 +501,8 @@ func (ctx valueConverterContext) warnf(format string, args ...any) {
 type valueConverter func(valueConverterContext, any) any
 
 func init() {
-	for k, v := range exifFields {
-		exifFieldsAll[k] = v
-	}
-	for k, v := range exifFieldsGPS {
-		exifFieldsAll[k] = v
-	}
+	maps.Copy(exifFieldsAll, exifFields)
+	maps.Copy(exifFieldsAll, exifFieldsGPS)
 
 	for k := range exifFieldsAll {
 		if k > maxEXIFField {

metadecoder_iptc.go

@@ -338,7 +338,7 @@ func getIptcRecordName(record uint8) string {
 }
 
 func init() {
-	var fields []map[string]interface{}
+	var fields []map[string]any
 	if err := json.Unmarshal(ipctTagsJSON, &fields); err != nil {
 		panic(err)
 	}