Merge pull request #78 from qmuntal/anyr

Rewrite interface{} to any

Author: qmuntal

README.md

@@ -206,7 +206,7 @@ func init() {
     gltf.RegisterExtension(ExtensionName, Unmarshal)
 }
 
-func Unmarshal(data []byte) (interface{}, error) {
+func Unmarshal(data []byte) (any, error) {
     foo := new(Foo)
     err := json.Unmarshal(data, foo)
     return foo, err

binary/binary.go

@@ -9,22 +9,22 @@
 // they all follow the same `generic` interface, and the only difference is the
 // type of the value:
 //
-// type Component interface {
-//   Scalar([]byte) interface{}
-//   Vec2([]byte) [2]interface{}
-//   Vec3([]byte) [2]interface{}
-//   Vec4([]byte) [2]interface{}
-//   Mat2([]byte) [2][2]interface{}
-//   Mat3([]byte) [3][3]interface{}
-//   Mat4([]byte) [4][4]interface{}
-//   PutScalar([]byte, interface{})
-//   PutVec2([]byte, [2]interface{})
-//   PutVec3([]byte, [3]interface{})
-//   PutVec4([]byte, [4]interface{})
-//   PutMat2([]byte, [2][2]interface{})
-//   PutMat3([]byte, [3][3]interface{})
-//   PutMat4([]byte, [4][4]interface{})
-// }
+//	type Component interface {
+//	  Scalar([]byte) any
+//	  Vec2([]byte) [2]any
+//	  Vec3([]byte) [2]any
+//	  Vec4([]byte) [2]any
+//	  Mat2([]byte) [2][2]any
+//	  Mat3([]byte) [3][3]any
+//	  Mat4([]byte) [4][4]any
+//	  PutScalar([]byte, any)
+//	  PutVec2([]byte, [2]any)
+//	  PutVec3([]byte, [3]any)
+//	  PutVec4([]byte, [4]any)
+//	  PutMat2([]byte, [2][2]any)
+//	  PutMat3([]byte, [3][3]any)
+//	  PutMat4([]byte, [4][4]any)
+//	}
 //
 // This package favors simplicity and compliance over efficiency,
 // but it is still an order of magnitude more performant than using the built-in

binary/encode.go

@@ -14,7 +14,7 @@ import (
 //
 // Data should be a slice of glTF predefined fixed-size types.
 // If data length is greater than the length of b, Read returns io.ErrShortBuffer.
-func Read(b []byte, byteStride uint32, data interface{}) error {
+func Read(b []byte, byteStride uint32, data any) error {
 	c, t, n := Type(data)
 	size := gltf.SizeOfElement(c, t)
 	if byteStride == 0 {
@@ -222,7 +222,7 @@ func Read(b []byte, byteStride uint32, data interface{}) error {
 //
 // Data must be a slice of glTF predefined fixed-size types,
 // else it fallbacks to `encoding/binary.Write`.
-func Write(b []byte, stride uint32, data interface{}) error {
+func Write(b []byte, stride uint32, data any) error {
 	c, t, n := Type(data)
 	if n == 0 {
 		return binary.Write(bytes.NewBuffer(b), binary.LittleEndian, data)

binary/encode_test.go

@@ -49,12 +49,12 @@ func buildBufferF(n int) []byte {
 func TestRead(t *testing.T) {
 	type args struct {
 		b    []byte
-		data interface{}
+		data any
 	}
 	tests := []struct {
 		name    string
 		args    args
-		want    interface{}
+		want    any
 		wantErr bool
 	}{
 		{"small", args{[]byte{0, 0}, []int8{1, 2, 3}}, []int8{0, 0}, true},
@@ -179,7 +179,7 @@ func TestRead(t *testing.T) {
 func TestWrite(t *testing.T) {
 	type args struct {
 		n    int
-		data interface{}
+		data any
 	}
 	tests := []struct {
 		name    string

binary/slice.go

@@ -11,7 +11,7 @@ import (
 // MakeSliceBuffer returns the slice type associated with c and t and with the given element count.
 // If the buffer is an slice which type matches with the expected by the acr then it will
 // be used as backing slice.
-func MakeSliceBuffer(c gltf.ComponentType, t gltf.AccessorType, count uint32, buffer interface{}) interface{} {
+func MakeSliceBuffer(c gltf.ComponentType, t gltf.AccessorType, count uint32, buffer any) any {
 	if buffer == nil {
 		return MakeSlice(c, t, count)
 	}
@@ -32,7 +32,7 @@ func MakeSliceBuffer(c gltf.ComponentType, t gltf.AccessorType, count uint32, bu
 // MakeSlice returns the slice type associated with c and t and with the given element count.
 // For example, if c is gltf.ComponentFloat and t is gltf.AccessorVec3
 // then MakeSlice(c, t, 5) is equivalent to make([][3]float32, 5).
-func MakeSlice(c gltf.ComponentType, t gltf.AccessorType, count uint32) interface{} {
+func MakeSlice(c gltf.ComponentType, t gltf.AccessorType, count uint32) any {
 	var tp reflect.Type
 	switch c {
 	case gltf.ComponentUbyte:
@@ -68,7 +68,7 @@ func MakeSlice(c gltf.ComponentType, t gltf.AccessorType, count uint32) interfac
 
 // Type returns the associated glTF type data.
 // It panics if data is not an slice.
-func Type(data interface{}) (c gltf.ComponentType, t gltf.AccessorType, count uint32) {
+func Type(data any) (c gltf.ComponentType, t gltf.AccessorType, count uint32) {
 	v := reflect.ValueOf(data)
 	if v.Kind() != reflect.Slice {
 		panic(fmt.Sprintf("go3mf: binary.Type expecting a slice but got %s", v.Kind()))

binary/slice_test.go

@@ -16,7 +16,7 @@ func TestMakeSlice(t *testing.T) {
 	tests := []struct {
 		name string
 		args args
-		want interface{}
+		want any
 	}{
 		// Scalar
 		{"[]uint8", args{gltf.ComponentUbyte, gltf.AccessorScalar, 5}, make([]uint8, 5)},
@@ -82,12 +82,12 @@ func TestMakeSliceBuffer(t *testing.T) {
 		c      gltf.ComponentType
 		t      gltf.AccessorType
 		count  uint32
-		buffer interface{}
+		buffer any
 	}
 	tests := []struct {
 		name string
 		args args
-		want interface{}
+		want any
 	}{
 		{"nil buffer", args{gltf.ComponentUbyte, gltf.AccessorVec2, 2, nil}, make([][2]uint8, 2)},
 		{"empty buffer", args{gltf.ComponentUbyte, gltf.AccessorVec2, 2, make([][2]uint8, 0)}, make([][2]uint8, 2)},

encode_test.go

@@ -676,7 +676,7 @@ func (f *fakeExt) UnmarshalJSON(data []byte) error {
 }
 
 func TestExtensions_UnmarshalJSON(t *testing.T) {
-	RegisterExtension("fake_ext", func(data []byte) (interface{}, error) {
+	RegisterExtension("fake_ext", func(data []byte) (any, error) {
 		e := new(fakeExt)
 		err := json.Unmarshal(data, e)
 		return e, err

ext/lightspuntual/lightspuntual.go

@@ -25,7 +25,7 @@ type envelop struct {
 }
 
 // Unmarshal decodes the json data into the correct type.
-func Unmarshal(data []byte) (interface{}, error) {
+func Unmarshal(data []byte) (any, error) {
 	var env envelop
 	if err := json.Unmarshal([]byte(data), &env); err != nil {
 		return nil, err

ext/lightspuntual/lightspuntual_test.go

@@ -114,7 +114,7 @@ func TestUnmarshal(t *testing.T) {
 	tests := []struct {
 		name    string
 		args    args
-		want    interface{}
+		want    any
 		wantErr bool
 	}{
 		{"error", args{[]byte(`{"light: 1}`)}, nil, true},

ext/specular/specular.go

@@ -13,7 +13,7 @@ const (
 )
 
 // Unmarshal decodes the json data into the correct type.
-func Unmarshal(data []byte) (interface{}, error) {
+func Unmarshal(data []byte) (any, error) {
 	pbr := new(PBRSpecularGlossiness)
 	err := json.Unmarshal(data, pbr)
 	return pbr, err