Use range over int

Author: oschwald

decoder.go

@@ -125,7 +125,7 @@ PATH:
 				// XXX - use type names in errors.
 				return fmt.Errorf("expected a map for %s but found %d", v, typeNum)
 			}
-			for i := uint(0); i < size; i++ {
+			for range size {
 				var key []byte
 				key, offset, err = d.decodeKey(offset)
 				if err != nil {
@@ -682,7 +682,7 @@ func (d *decoder) decodeMap(
 	keyValue := reflect.New(mapType.Key()).Elem()
 	elemType := mapType.Elem()
 	var elemValue reflect.Value
-	for i := uint(0); i < size; i++ {
+	for range size {
 		var key []byte
 		var err error
 		key, offset, err = d.decodeKey(offset)
@@ -717,7 +717,7 @@ func (d *decoder) decodeMapToDeserializer(
 	if err != nil {
 		return 0, err
 	}
-	for i := uint(0); i < size; i++ {
+	for range size {
 		// TODO - implement key/value skipping?
 		offset, err = d.decodeToDeserializer(offset, dser, depth, true)
 		if err != nil {
@@ -778,9 +778,9 @@ func (d *decoder) decodeSlice(
 	depth int,
 ) (uint, error) {
 	result.Set(reflect.MakeSlice(result.Type(), int(size), int(size)))
-	for i := 0; i < int(size); i++ {
+	for i := range size {
 		var err error
-		offset, err = d.decode(offset, result.Index(i), depth)
+		offset, err = d.decode(offset, result.Index(int(i)), depth)
 		if err != nil {
 			return 0, err
 		}
@@ -798,7 +798,7 @@ func (d *decoder) decodeSliceToDeserializer(
 	if err != nil {
 		return 0, err
 	}
-	for i := uint(0); i < size; i++ {
+	for range size {
 		offset, err = d.decodeToDeserializer(offset, dser, depth, true)
 		if err != nil {
 			return 0, err
@@ -833,7 +833,7 @@ func (d *decoder) decodeStruct(
 	}
 
 	// This handles named fields
-	for i := uint(0); i < size; i++ {
+	for range size {
 		var (
 			err error
 			key []byte
@@ -877,7 +877,7 @@ func cachedFields(result reflect.Value) *fieldsType {
 	numFields := resultType.NumField()
 	namedFields := make(map[string]int, numFields)
 	var anonymous []int
-	for i := 0; i < numFields; i++ {
+	for i := range numFields {
 		field := resultType.Field(i)
 
 		fieldName := field.Name

decoder_test.go

@@ -197,7 +197,7 @@ func TestUint128(t *testing.T) {
 // This is _not_ meant to be a comprehensive power function.
 func powBigInt(bi *big.Int, pow uint) *big.Int {
 	newInt := big.NewInt(1)
-	for i := uint(0); i < pow; i++ {
+	for range pow {
 		newInt.Mul(newInt, bi)
 	}
 	return newInt

reader_test.go

@@ -737,7 +737,7 @@ func checkMetadata(t *testing.T, reader *Reader, ipVersion, recordSize uint) {
 }
 
 func checkIpv4(t *testing.T, reader *Reader) {
-	for i := uint(0); i < 6; i++ {
+	for i := range uint(6) {
 		address := fmt.Sprintf("1.1.1.%d", uint(1)<<i)
 		ip := netip.MustParseAddr(address)
 
@@ -820,7 +820,7 @@ func checkIpv6(t *testing.T, reader *Reader) {
 func BenchmarkOpen(b *testing.B) {
 	var db *Reader
 	var err error
-	for i := 0; i < b.N; i++ {
+	for range b.N {
 		db, err = Open("GeoLite2-City.mmdb")
 		if err != nil {
 			b.Fatal(err)
@@ -839,7 +839,7 @@ func BenchmarkInterfaceLookup(b *testing.B) {
 	var result any
 
 	s := make(net.IP, 4)
-	for i := 0; i < b.N; i++ {
+	for range b.N {
 		ip := randomIPv4Address(r, s)
 		err = db.Lookup(ip).Decode(&result)
 		if err != nil {
@@ -857,7 +857,7 @@ func BenchmarkLookupNetwork(b *testing.B) {
 	r := rand.New(rand.NewSource(time.Now().UnixNano()))
 
 	s := make(net.IP, 4)
-	for i := 0; i < b.N; i++ {
+	for range b.N {
 		ip := randomIPv4Address(r, s)
 		res := db.Lookup(ip)
 		if err := res.Err(); err != nil {
@@ -929,7 +929,7 @@ func BenchmarkCityLookup(b *testing.B) {
 	var result fullCity
 
 	s := make(net.IP, 4)
-	for i := 0; i < b.N; i++ {
+	for range b.N {
 		ip := randomIPv4Address(r, s)
 		err = db.Lookup(ip).Decode(&result)
 		if err != nil {
@@ -947,7 +947,7 @@ func BenchmarkCityLookupOnly(b *testing.B) {
 	r := rand.New(rand.NewSource(time.Now().UnixNano()))
 
 	s := make(net.IP, 4)
-	for i := 0; i < b.N; i++ {
+	for range b.N {
 		ip := randomIPv4Address(r, s)
 		result := db.Lookup(ip)
 		if err := result.Err(); err != nil {
@@ -972,7 +972,7 @@ func BenchmarkDecodeCountryCodeWithStruct(b *testing.B) {
 	var result MinCountry
 
 	s := make(net.IP, 4)
-	for i := 0; i < b.N; i++ {
+	for range b.N {
 		ip := randomIPv4Address(r, s)
 		err = db.Lookup(ip).Decode(&result)
 		if err != nil {
@@ -993,7 +993,7 @@ func BenchmarkDecodePathCountryCode(b *testing.B) {
 	var result string
 
 	s := make(net.IP, 4)
-	for i := 0; i < b.N; i++ {
+	for range b.N {
 		ip := randomIPv4Address(r, s)
 		err = db.Lookup(ip).DecodePath(&result, path...)
 		if err != nil {

traverse_test.go

@@ -389,7 +389,7 @@ func BenchmarkNetworks(b *testing.B) {
 	db, err := Open(testFile("GeoIP2-Country-Test.mmdb"))
 	require.NoError(b, err)
 
-	for i := 0; i < b.N; i++ {
+	for range b.N {
 		for r := range db.Networks() {
 			var rec struct{}
 			err = r.Decode(&rec)