interface{} -> any

ilius · Feb 24, 2024 · 2af2306 · 2af2306
1 parent 6f626c7
commit 2af2306
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/lib/common_test.go b/lib/common_test.go
@@ -16,7 +16,7 @@ func strPtr(s string) *string {
 	return &s2
 }
 
-func newTestState(patternArg interface{}) *passgen.State {
+func newTestState(patternArg any) *passgen.State {
 	var pattern []rune
 	switch patternTyped := patternArg.(type) {
 	case string:
@@ -56,5 +56,5 @@ type genCase struct {
 type genErrCase struct {
 	Pattern string
 
-	Error interface{}
+	Error any
 }
diff --git a/lib/generate_test.go b/lib/generate_test.go
@@ -75,7 +75,7 @@ func TestGenerate(t *testing.T) {
 			is.Equal(actual, tc.WordCount)
 		}
 	}
-	checkErrorIsInList := func(is *is.Is, err error, expMsgs []interface{}) {
+	checkErrorIsInList := func(is *is.Is, err error, expMsgs []any) {
 		if !is.Err(err) {
 			return
 		}
@@ -107,7 +107,7 @@ func TestGenerate(t *testing.T) {
 			} else {
 				is.ErrMsg(err, expErr)
 			}
-		case []interface{}:
+		case []any:
 			checkErrorIsInList(is, err, expErr)
 		case *passgen.Error:
 			is.Equal(tErr.Type(), expErr.Type())
@@ -698,7 +698,7 @@ func TestGenerate(t *testing.T) {
 	testErr(&genErrCase{
 		// FIXME: if one part of alteration has no error, test becomes flaky
 		Pattern: `([:foobar1:]|[:foobar2:])`,
-		Error: []interface{}{
+		Error: []any{
 			`value error near index 9: invalid character class "foobar1"`,
 			`value error near index 20: invalid character class "foobar2"`,
 		},

diff --git a/lib/repeat_internal_test.go b/lib/repeat_internal_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/ilius/is/v2"
 )
 
-func newTestState(patternArg interface{}) *State {
+func newTestState(patternArg any) *State {
 	var pattern []rune
 	switch patternTyped := patternArg.(type) {
 	case string:

diff --git a/lib/state.go b/lib/state.go
@@ -101,31 +101,31 @@ func (s *State) getErrorPos() uint {
 	return uint(pos)
 }
 
-func (s *State) errorSyntax(msg string, args ...interface{}) error {
+func (s *State) errorSyntax(msg string, args ...any) error {
 	return NewError(
 		ErrorSyntax,
 		s.getErrorPos(),
 		fmt.Sprintf(msg, args...),
 	).WithMarkLen(s.errorMarkLen)
 }
 
-func (s *State) errorArg(msg string, args ...interface{}) error {
+func (s *State) errorArg(msg string, args ...any) error {
 	return NewError(
 		ErrorArg,
 		s.getErrorPos(),
 		fmt.Sprintf(msg, args...),
 	).WithMarkLen(s.errorMarkLen)
 }
 
-func (s *State) errorValue(msg string, args ...interface{}) error {
+func (s *State) errorValue(msg string, args ...any) error {
 	return NewError(
 		ErrorValue,
 		s.getErrorPos(),
 		fmt.Sprintf(msg, args...),
 	).WithMarkLen(s.errorMarkLen)
 }
 
-func (s *State) errorUnknown(msg string, args ...interface{}) error {
+func (s *State) errorUnknown(msg string, args ...any) error {
 	return NewError(
 		ErrorUnknown,
 		s.getErrorPos(),