Make capitalization of uint consistent

Author: oschwald

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changes
 
+## 2.0.0-beta.7 - 2025-07-07
+
+* Update capitalization of "uint" in `ReadUInt*` to match `KindUint*` as well
+  as the Go standard library.
+
+## 2.0.0-beta.6 - 2025-07-07
+
+* Invalid release with no code changes.
+
 ## 2.0.0-beta.5 - 2025-07-06
 
 - Added `Offset()` method to `Decoder` to get the current database offset. This

example_test.go

@@ -223,7 +223,7 @@ func (c *CustomCity) UnmarshalMaxMindDB(d *mmdbdata.Decoder) error {
 					}
 					c.Names = names
 				case "geoname_id":
-					geoID, err := d.ReadUInt32()
+					geoID, err := d.ReadUint32()
 					if err != nil {
 						return err
 					}

internal/decoder/decoder.go

@@ -142,10 +142,10 @@ func (d *Decoder) ReadInt32() (int32, error) {
 	return value, nil
 }
 
-// ReadUInt16 reads the value pointed by the decoder as a uint16.
+// ReadUint16 reads the value pointed by the decoder as a uint16.
 //
 // Returns an error if the database is malformed or if the pointed value is not an uint16.
-func (d *Decoder) ReadUInt16() (uint16, error) {
+func (d *Decoder) ReadUint16() (uint16, error) {
 	size, offset, err := d.decodeCtrlDataAndFollow(KindUint16)
 	if err != nil {
 		return 0, d.wrapError(err)
@@ -160,10 +160,10 @@ func (d *Decoder) ReadUInt16() (uint16, error) {
 	return value, nil
 }
 
-// ReadUInt32 reads the value pointed by the decoder as a uint32.
+// ReadUint32 reads the value pointed by the decoder as a uint32.
 //
 // Returns an error if the database is malformed or if the pointed value is not an uint32.
-func (d *Decoder) ReadUInt32() (uint32, error) {
+func (d *Decoder) ReadUint32() (uint32, error) {
 	size, offset, err := d.decodeCtrlDataAndFollow(KindUint32)
 	if err != nil {
 		return 0, d.wrapError(err)
@@ -178,10 +178,10 @@ func (d *Decoder) ReadUInt32() (uint32, error) {
 	return value, nil
 }
 
-// ReadUInt64 reads the value pointed by the decoder as a uint64.
+// ReadUint64 reads the value pointed by the decoder as a uint64.
 //
 // Returns an error if the database is malformed or if the pointed value is not an uint64.
-func (d *Decoder) ReadUInt64() (uint64, error) {
+func (d *Decoder) ReadUint64() (uint64, error) {
 	size, offset, err := d.decodeCtrlDataAndFollow(KindUint64)
 	if err != nil {
 		return 0, d.wrapError(err)
@@ -196,10 +196,10 @@ func (d *Decoder) ReadUInt64() (uint64, error) {
 	return value, nil
 }
 
-// ReadUInt128 reads the value pointed by the decoder as a uint128.
+// ReadUint128 reads the value pointed by the decoder as a uint128.
 //
 // Returns an error if the database is malformed or if the pointed value is not an uint128.
-func (d *Decoder) ReadUInt128() (hi, lo uint64, err error) {
+func (d *Decoder) ReadUint128() (hi, lo uint64, err error) {
 	size, offset, err := d.decodeCtrlDataAndFollow(KindUint128)
 	if err != nil {
 		return 0, 0, d.wrapError(err)

internal/decoder/decoder_test.go

@@ -251,7 +251,7 @@ func TestDecodeUint16(t *testing.T) {
 	for hexStr, expected := range tests {
 		t.Run(hexStr, func(t *testing.T) {
 			decoder := newDecoderFromHex(t, hexStr)
-			result, err := decoder.ReadUInt16() // [cite: 42]
+			result, err := decoder.ReadUint16() // [cite: 42]
 			require.NoError(t, err)
 			require.Equal(t, expected, result)
 			require.True(t, decoder.hasNextOffset || decoder.offset > 0, "Offset was not advanced")
@@ -273,7 +273,7 @@ func TestDecodeUint32(t *testing.T) {
 	for hexStr, expected := range tests {
 		t.Run(hexStr, func(t *testing.T) {
 			decoder := newDecoderFromHex(t, hexStr)
-			result, err := decoder.ReadUInt32() // [cite: 44]
+			result, err := decoder.ReadUint32() // [cite: 44]
 			require.NoError(t, err)
 			require.Equal(t, expected, result)
 			require.True(t, decoder.hasNextOffset || decoder.offset > 0, "Offset was not advanced")
@@ -295,7 +295,7 @@ func TestDecodeUint64(t *testing.T) {
 	for hexStr, expected := range tests {
 		t.Run(hexStr, func(t *testing.T) {
 			decoder := newDecoderFromHex(t, hexStr)
-			result, err := decoder.ReadUInt64() // [cite: 46]
+			result, err := decoder.ReadUint64() // [cite: 46]
 			require.NoError(t, err)
 			require.Equal(t, expected, result)
 			require.True(t, decoder.hasNextOffset || decoder.offset > 0, "Offset was not advanced")
@@ -321,7 +321,7 @@ func TestDecodeUint128(t *testing.T) {
 	for hexStr, expected := range tests {
 		t.Run(hexStr, func(t *testing.T) {
 			decoder := newDecoderFromHex(t, hexStr)
-			hi, lo, err := decoder.ReadUInt128() // [cite: 48]
+			hi, lo, err := decoder.ReadUint128() // [cite: 48]
 			require.NoError(t, err)
 
 			// Reconstruct the big.Int from hi and lo parts for comparison
@@ -405,15 +405,15 @@ func TestBoundsChecking(t *testing.T) {
 	require.Error(t, err)
 	require.Contains(t, err.Error(), "exceeds buffer length")
 
-	// Test DecodeUInt128 bounds checking
+	// Test DecodeUint128 bounds checking
 	uint128Buffer := []byte{
 		0x0B,
 		0x03,
 	} // Extended type (0x0), size 11, TypeUint128-7=3, but only 2 bytes total
 	dd2 := NewDataDecoder(uint128Buffer)
 	decoder2 := NewDecoder(dd2, 0)
 
-	_, _, err = decoder2.ReadUInt128()
+	_, _, err = decoder2.ReadUint128()
 	require.Error(t, err)
 	require.Contains(t, err.Error(), "unexpected end of database")
 }

internal/decoder/nested_unmarshaler_test.go

@@ -125,7 +125,7 @@ type testItem struct {
 
 func (item *testItem) UnmarshalMaxMindDB(d *Decoder) error {
 	item.custom = true
-	id, err := d.ReadUInt32()
+	id, err := d.ReadUint32()
 	if err != nil {
 		return err
 	}

mmdbdata/doc.go

@@ -31,7 +31,7 @@
 //				}
 //				c.Names = names
 //			case "geoname_id":
-//				geoID, err := d.ReadUInt32()
+//				geoID, err := d.ReadUint32()
 //				if err != nil { return err }
 //				c.GeoNameID = uint(geoID)
 //			default:

reader_test.go

@@ -1148,7 +1148,7 @@ func (c *TestCity) UnmarshalMaxMindDB(d *mmdbdata.Decoder) error {
 			}
 			c.Names = names
 		case "geoname_id":
-			geoID, err := d.ReadUInt32()
+			geoID, err := d.ReadUint32()
 			if err != nil {
 				return err
 			}
@@ -1188,7 +1188,7 @@ func (a *TestASN) UnmarshalMaxMindDB(d *mmdbdata.Decoder) error {
 			}
 			a.AutonomousSystemOrganization = org
 		case "autonomous_system_number":
-			asn, err := d.ReadUInt32()
+			asn, err := d.ReadUint32()
 			if err != nil {
 				return err
 			}