replace interface{} with any to be more go1.18-ish

Author: markus-wa

go.mod

@@ -20,6 +20,7 @@ require (
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/stretchr/objx v0.1.0 // indirect
+	golang.org/x/exp v0.0.0-20220613132600-b0d781184e0d // indirect
 	golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
 )

go.sum

@@ -37,6 +37,8 @@ github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+golang.org/x/exp v0.0.0-20220613132600-b0d781184e0d h1:vtUKgx8dahOomfFzLREU8nSv25YHnTgLBn4rDnWZdU0=
+golang.org/x/exp v0.0.0-20220613132600-b0d781184e0d/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
 golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81 h1:00VmoueYNlNz/aHIilyyQz/MHSqGoWJzpFv/HW8xpzI=
 golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

internal/bitread/bitread.go

@@ -90,7 +90,7 @@ func (r *BitReader) ReadUBitInt() uint {
 }
 
 var bitReaderPool = sync.Pool{
-	New: func() interface{} {
+	New: func() any {
 		return new(BitReader)
 	},
 }
@@ -123,7 +123,7 @@ func newBitReader(underlying io.Reader, buffer *[]byte) *BitReader {
 }
 
 var smallBufferPool = sync.Pool{
-	New: func() interface{} {
+	New: func() any {
 		b := make([]byte, smallBuffer)
 		return &b
 	},

pkg/demoinfocs/debug_on.go

@@ -40,7 +40,7 @@ func debugGameEvent(d *msg.CSVCMsg_GameEventListDescriptorT, ge *msg.CSVCMsg_Gam
 
 	if debugGameEvents == yes {
 		// Map only the relevant data for each type
-		data := make(map[string]interface{})
+		data := make(map[string]any)
 
 		for k, v := range mapGameEventData(d, ge) {
 			switch v.Type {

pkg/demoinfocs/demoinfocs_test.go

@@ -62,7 +62,7 @@ func TestDemoInfoCs(t *testing.T) {
 	})
 
 	var actual bytes.Buffer
-	p.RegisterEventHandler(func(e interface{}) {
+	p.RegisterEventHandler(func(e any) {
 		actual.WriteString(fmt.Sprintf("%#v\n", e))
 	})
 

pkg/demoinfocs/fake/parser.go

@@ -7,6 +7,7 @@ import (
 
 	dp "github.com/markus-wa/godispatch"
 	mock "github.com/stretchr/testify/mock"
+	"golang.org/x/exp/constraints"
 
 	demoinfocs "github.com/markus-wa/demoinfocs-golang/v2/pkg/demoinfocs"
 	common "github.com/markus-wa/demoinfocs-golang/v2/pkg/demoinfocs/common"
@@ -22,12 +23,12 @@ type Parser struct {
 	// List of events to be dispatched by frame.
 	// ParseToEnd() / ParseNextFrame() will dispatch them accordingly.
 	// See also: MockEvents() / MockEventsFrame()
-	Events map[int][]interface{}
+	Events map[int][]any
 
 	// List of net-messages to be dispatched by frame.
 	// ParseToEnd() / ParseNextFrame() will dispatch them accordingly.
 	// See also: MockNetMessages() / MockNetMessagesFrame()
-	NetMessages map[int][]interface{}
+	NetMessages map[int][]any
 
 	eventDispatcher dp.Dispatcher
 	msgDispatcher   dp.Dispatcher
@@ -40,15 +41,15 @@ type Parser struct {
 // in subsequent calls to this or MockNetMessages() is triggered on a separate frame.
 //
 // See also: MockEventsFrame()
-func (p *Parser) MockEvents(events ...interface{}) {
+func (p *Parser) MockEvents(events ...any) {
 	p.MockEventsFrame(p.mockFrame, events...)
 	p.mockFrame++
 }
 
 // MockEventsFrame adds entries to Events that will be dispatched at the frame indicated by the first parameter.
 //
 // See also: MockEvents()
-func (p *Parser) MockEventsFrame(frame int, events ...interface{}) {
+func (p *Parser) MockEventsFrame(frame int, events ...any) {
 	p.Events[frame] = append(p.Events[frame], events...)
 }
 
@@ -57,24 +58,24 @@ func (p *Parser) MockEventsFrame(frame int, events ...interface{}) {
 // in subsequent calls to this or MockEvents() is triggered on a separate frame.
 //
 // See also: MockNetMessagesFrame()
-func (p *Parser) MockNetMessages(messages ...interface{}) {
+func (p *Parser) MockNetMessages(messages ...any) {
 	p.MockNetMessagesFrame(p.mockFrame, messages...)
 	p.mockFrame++
 }
 
 // MockNetMessagesFrame adds entries to NetMessages that will be dispatched at the frame indicated by the first parameter.
 //
 // See also: MockNetMessages()
-func (p *Parser) MockNetMessagesFrame(frame int, messages ...interface{}) {
+func (p *Parser) MockNetMessagesFrame(frame int, messages ...any) {
 	p.NetMessages[frame] = append(p.NetMessages[frame], messages...)
 }
 
 // NewParser returns a new parser mock with pre-initialized Events and NetMessages.
 // Pre-mocks RegisterEventHandler() and RegisterNetMessageHandler().
 func NewParser() *Parser {
 	p := &Parser{
-		Events:      make(map[int][]interface{}),
-		NetMessages: make(map[int][]interface{}),
+		Events:      make(map[int][]any),
+		NetMessages: make(map[int][]any),
 	}
 
 	p.On("RegisterEventHandler").Return()
@@ -127,7 +128,7 @@ func (p *Parser) Progress() float32 {
 
 // RegisterEventHandler is a mock-implementation of Parser.RegisterEventHandler().
 // Return HandlerIdentifier cannot be mocked (for now).
-func (p *Parser) RegisterEventHandler(handler interface{}) dp.HandlerIdentifier {
+func (p *Parser) RegisterEventHandler(handler any) dp.HandlerIdentifier {
 	p.Called()
 	return p.eventDispatcher.RegisterHandler(handler)
 }
@@ -140,7 +141,7 @@ func (p *Parser) UnregisterEventHandler(identifier dp.HandlerIdentifier) {
 
 // RegisterNetMessageHandler is a mock-implementation of Parser.RegisterNetMessageHandler().
 // Return HandlerIdentifier cannot be mocked (for now).
-func (p *Parser) RegisterNetMessageHandler(handler interface{}) dp.HandlerIdentifier {
+func (p *Parser) RegisterNetMessageHandler(handler any) dp.HandlerIdentifier {
 	p.Called()
 	return p.msgDispatcher.RegisterHandler(handler)
 }
@@ -165,8 +166,8 @@ func (p *Parser) ParseHeader() (common.DemoHeader, error) {
 func (p *Parser) ParseToEnd() (err error) {
 	args := p.Called()
 
-	maxFrame := max(p.Events)
-	maxNetMessageFrame := max(p.NetMessages)
+	maxFrame := maxKey(p.Events)
+	maxNetMessageFrame := maxKey(p.NetMessages)
 
 	if maxFrame < maxNetMessageFrame {
 		maxFrame = maxNetMessageFrame
@@ -210,7 +211,7 @@ func (p *Parser) ParseNextFrame() (b bool, err error) {
 	return args.Bool(0), args.Error(1)
 }
 
-func max(numbers map[int][]interface{}) (maxNumber int) {
+func maxKey[T any, N constraints.Ordered](numbers map[N]T) (maxNumber N) {
 	for n := range numbers {
 		if n > maxNumber {
 			maxNumber = n

pkg/demoinfocs/fake/parser_test.go

@@ -34,13 +34,13 @@ func TestParseNextFrameEvents(t *testing.T) {
 	p := fake.NewParser()
 	p.On("ParseNextFrame").Return(true, nil)
 
-	expected := []interface{}{kill(common.EqAK47), kill(common.EqScout)}
+	expected := []any{kill(common.EqAK47), kill(common.EqScout)}
 	p.MockEvents(expected...)
 
 	// Kill on second frame that shouldn't be dispatched during the first frame
 	p.MockEvents(kill(common.EqAUG))
 
-	var actual []interface{}
+	var actual []any
 	p.RegisterEventHandler(func(e events.Kill) {
 		actual = append(actual, e)
 	})
@@ -64,11 +64,11 @@ func kill(wepType common.EquipmentType) events.Kill {
 func TestParseToEndEvents(t *testing.T) {
 	p := fake.NewParser()
 	p.On("ParseToEnd").Return(nil)
-	expected := []interface{}{kill(common.EqAK47), kill(common.EqScout), kill(common.EqAUG)}
+	expected := []any{kill(common.EqAK47), kill(common.EqScout), kill(common.EqAUG)}
 	p.MockEvents(expected[:1]...)
 	p.MockEvents(expected[1:]...)
 
-	var actual []interface{}
+	var actual []any
 	p.RegisterEventHandler(func(e events.Kill) {
 		actual = append(actual, e)
 	})
@@ -82,7 +82,7 @@ func TestParseToEndEvents(t *testing.T) {
 func TestParseNextFrameNetMessages(t *testing.T) {
 	p := fake.NewParser()
 	p.On("ParseNextFrame").Return(true, nil)
-	expected := []interface{}{
+	expected := []any{
 		cmdKey(1, 2, 3),
 		cmdKey(100, 255, 8),
 	}
@@ -91,8 +91,8 @@ func TestParseNextFrameNetMessages(t *testing.T) {
 	// Message on second frame that shouldn't be dispatched during the first frame
 	p.MockNetMessages(msg.CSVCMsg_Menu{DialogType: proto.Int32(1), MenuKeyValues: []byte{1, 55, 99}})
 
-	var actual []interface{}
-	p.RegisterNetMessageHandler(func(message interface{}) {
+	var actual []any
+	p.RegisterNetMessageHandler(func(message any) {
 		actual = append(actual, message)
 	})
 
@@ -106,7 +106,7 @@ func TestParseNextFrameNetMessages(t *testing.T) {
 func TestParseToEndNetMessages(t *testing.T) {
 	p := fake.NewParser()
 	p.On("ParseToEnd").Return(nil)
-	expected := []interface{}{
+	expected := []any{
 		cmdKey(1, 2, 3),
 		cmdKey(100, 255, 8),
 		msg.CSVCMsg_Menu{DialogType: proto.Int32(1), MenuKeyValues: []byte{1, 55, 99}},
@@ -115,8 +115,8 @@ func TestParseToEndNetMessages(t *testing.T) {
 	p.MockNetMessages(expected[:1]...)
 	p.MockNetMessages(expected[1:]...)
 
-	var actual []interface{}
-	p.RegisterNetMessageHandler(func(message interface{}) {
+	var actual []any
+	p.RegisterNetMessageHandler(func(message any) {
 		actual = append(actual, message)
 	})
 

pkg/demoinfocs/game_events.go

@@ -60,7 +60,7 @@ type gameEventHandler struct {
 	ignoreBombsiteIndexNotFound bool // see https://github.com/markus-wa/demoinfocs-golang/issues/314
 }
 
-func (geh gameEventHandler) dispatch(event interface{}) {
+func (geh gameEventHandler) dispatch(event any) {
 	geh.parser.eventDispatcher.Dispatch(event)
 }
 

pkg/demoinfocs/parser.go

@@ -51,7 +51,7 @@ type parser struct {
 	bitReader                    *bit.BitReader
 	stParser                     *st.SendTableParser
 	additionalNetMessageCreators map[int]NetMessageCreator // Map of net-message-IDs to NetMessageCreators (for parsing custom net-messages)
-	msgQueue                     chan interface{}          // Queue of net-messages
+	msgQueue                     chan any                  // Queue of net-messages
 	msgDispatcher                *dp.Dispatcher            // Net-message dispatcher
 	gameEventHandler             gameEventHandler
 	userMessageHandler           userMessageHandler
@@ -194,19 +194,19 @@ func (p *parser) Progress() float32 {
 RegisterEventHandler registers a handler for game events.
 
 The handler must be of type func(<EventType>) where EventType is the kind of event to be handled.
-To catch all events func(interface{}) can be used.
+To catch all events func(any) can be used.
 
 Example:
 
 	parser.RegisterEventHandler(func(e events.WeaponFired) {
 		fmt.Printf("%s fired his %s\n", e.Shooter.Name, e.Weapon.Type)
 	})
 
-Parameter handler has to be of type interface{} because lolnogenerics.
+Parameter handler has to be of type any because Go generics only work on functions, not methods.
 
-Returns a identifier with which the handler can be removed via UnregisterEventHandler().
+Returns an identifier with which the handler can be removed via UnregisterEventHandler().
 */
-func (p *parser) RegisterEventHandler(handler interface{}) dp.HandlerIdentifier {
+func (p *parser) RegisterEventHandler(handler any) dp.HandlerIdentifier {
 	return p.eventDispatcher.RegisterHandler(handler)
 }
 
@@ -222,11 +222,13 @@ RegisterNetMessageHandler registers a handler for net-messages.
 
 The handler must be of type func(*<MessageType>) where MessageType is the kind of net-message to be handled.
 
-Returns a identifier with which the handler can be removed via UnregisterNetMessageHandler().
+Parameter handler has to be of type any because Go generics only work on functions, not methods.
+
+Returns an identifier with which the handler can be removed via UnregisterNetMessageHandler().
 
 See also: RegisterEventHandler()
 */
-func (p *parser) RegisterNetMessageHandler(handler interface{}) dp.HandlerIdentifier {
+func (p *parser) RegisterNetMessageHandler(handler any) dp.HandlerIdentifier {
 	return p.msgDispatcher.RegisterHandler(handler)
 }
 
@@ -350,7 +352,7 @@ func NewParserWithConfig(demostream io.Reader, config ParserConfig) Parser {
 	p.decryptionKey = config.NetMessageDecryptionKey
 
 	dispatcherCfg := dp.Config{
-		PanicHandler: func(v interface{}) {
+		PanicHandler: func(v any) {
 			p.setError(fmt.Errorf("%v\nstacktrace:\n%s", v, debug.Stack()))
 		},
 	}
@@ -380,7 +382,7 @@ func NewParserWithConfig(demostream io.Reader, config ParserConfig) Parser {
 }
 
 func (p *parser) initMsgQueue(buf int) {
-	p.msgQueue = make(chan interface{}, buf)
+	p.msgQueue = make(chan any, buf)
 	p.msgDispatcher.AddQueues(p.msgQueue)
 }
 

pkg/demoinfocs/parser_interface.go

@@ -5,9 +5,10 @@ package demoinfocs
 import (
 	"time"
 
+	dp "github.com/markus-wa/godispatch"
+
 	common "github.com/markus-wa/demoinfocs-golang/v2/pkg/demoinfocs/common"
 	st "github.com/markus-wa/demoinfocs-golang/v2/pkg/demoinfocs/sendtables"
-	dp "github.com/markus-wa/godispatch"
 )
 
 // Parser is an auto-generated interface for Parser, intended to be used when mockability is needed.
@@ -68,19 +69,19 @@ type Parser interface {
 	   RegisterEventHandler registers a handler for game events.
 
 	   The handler must be of type func(<EventType>) where EventType is the kind of event to be handled.
-	   To catch all events func(interface{}) can be used.
+	   To catch all events func(any) can be used.
 
 	   Example:
 
 	   	parser.RegisterEventHandler(func(e events.WeaponFired) {
 	   		fmt.Printf("%s fired his %s\n", e.Shooter.Name, e.Weapon.Type)
 	   	})
 
-	   Parameter handler has to be of type interface{} because lolnogenerics.
+	   Parameter handler has to be of type any because Go generics only work on functions, not methods.
 
 	   Returns a identifier with which the handler can be removed via UnregisterEventHandler().
 	*/
-	RegisterEventHandler(handler interface{}) dp.HandlerIdentifier
+	RegisterEventHandler(handler any) dp.HandlerIdentifier
 	// UnregisterEventHandler removes a game event handler via identifier.
 	//
 	// The identifier is returned at registration by RegisterEventHandler().
@@ -94,7 +95,7 @@ type Parser interface {
 
 	   See also: RegisterEventHandler()
 	*/
-	RegisterNetMessageHandler(handler interface{}) dp.HandlerIdentifier
+	RegisterNetMessageHandler(handler any) dp.HandlerIdentifier
 	// UnregisterNetMessageHandler removes a net-message handler via identifier.
 	//
 	// The identifier is returned at registration by RegisterNetMessageHandler().