更新

deatil · deatil · commit 3cc3ef29003e · 2025-02-08T23:41:39.000+08:00
diff --git a/ber/asn1/ber_asn1_test.go b/ber/asn1/ber_asn1_test.go
@@ -427,7 +427,7 @@ type TestSet struct {
 
 var unmarshalTestData = []struct {
     in  []byte
-    out interface{}
+    out any
 }{
     {[]byte{0x02, 0x01, 0x42}, newInt(0x42)},
     {[]byte{0x05, 0x00}, &RawValue{0, 5, false, false, []byte{}, []byte{0x05, 0x00}}},
@@ -493,7 +493,7 @@ type RelativeDistinguishedNameSET []AttributeTypeAndValue
 
 type AttributeTypeAndValue struct {
     Type  ObjectIdentifier
-    Value interface{}
+    Value any
 }
 
 type Validity struct {
@@ -926,7 +926,7 @@ func TestUnmarshalInvalidUTF8(t *testing.T) {
 func TestMarshalNilValue(t *testing.T) {
     nilValueTestData := []interface{}{
         nil,
-        struct{ V interface{} }{},
+        struct{ V any }{},
     }
     for i, test := range nilValueTestData {
         if _, err := Marshal(test); err == nil {
diff --git a/ber/asn1/ber_test.go b/ber/asn1/ber_test.go
@@ -65,7 +65,7 @@ type TestExplicitIndefinite struct {
 
 var berUnmarshalTestData = []struct {
     in  []byte
-    out interface{}
+    out any
 }{
     {
         []byte{0x30, 0x80, 0x31, 0x80, 0x02, 0x01, 0x01, 0x02, 0x01, 0x02, 0x02, 0x01, 0x03, 0x00, 0x00, 0x00, 0x00},
diff --git a/ber/asn1/encode_test.go b/ber/asn1/encode_test.go
@@ -129,7 +129,7 @@ type sequence2Test struct {
 }
 
 type marshalTest struct {
-    in  interface{}
+    in  any
     out string
 }
 
@@ -293,7 +293,7 @@ func TestMarshal2(t *testing.T) {
 }
 
 type marshalWithOptionsTest struct {
-    in      interface{}
+    in      any
     out     string
     options string
 }
diff --git a/hash/cmac/aes/cmac_test.go b/hash/cmac/aes/cmac_test.go
@@ -62,7 +62,7 @@ var testData = `
 
 // Load test vectors
 func loadCMACAESExamples() []cmacAESExample {
-    var examplesJSON map[string]interface{}
+    var examplesJSON map[string]any
 
     exampleData := []byte(testData)
 
diff --git a/hash/pmac/aes/pmac_test.go b/hash/pmac/aes/pmac_test.go
@@ -106,7 +106,7 @@ var testPmacData = `
 
 // Load test vectors
 func loadPMACAESExamples() []pmacAESExample {
-    var examplesJSON map[string]interface{}
+    var examplesJSON map[string]any
 
     exampleData := []byte(testPmacData)
 
diff --git a/hash/pmac/block_test.go b/hash/pmac/block_test.go
@@ -49,7 +49,7 @@ var testData = `
 
 // Load test vectors
 func loadDblExamples() []dblExample {
-    var examplesJSON map[string]interface{}
+    var examplesJSON map[string]any
 
     exampleData := []byte(testData)
 
diff --git a/hash/pmac/pmac_test.go b/hash/pmac/pmac_test.go
@@ -124,7 +124,7 @@ var testPmacData = `
 
 // Load test vectors
 func loadPMACAESExamples() []pmacAESExample {
-    var examplesJSON map[string]interface{}
+    var examplesJSON map[string]any
 
     exampleData := []byte(testPmacData)
 
diff --git a/mode/eax/eax_test.go b/mode/eax/eax_test.go
@@ -17,7 +17,7 @@ const (
 
 func TestEAXImplementsAEADInterface(t *testing.T) {
     var eaxInstance eax
-    var aux interface{} = &eaxInstance
+    var aux any = &eaxInstance
     _, ok := aux.(cipher.AEAD)
     if !ok {
         t.Errorf("Error: EAX does not implement AEAD interface")
diff --git a/mode/ocb/ocb_test.go b/mode/ocb/ocb_test.go
@@ -21,7 +21,7 @@ const (
 
 func TestOCBImplementsAEADInterface(t *testing.T) {
     var ocbInstance ocb
-    var aux interface{} = &ocbInstance
+    var aux any = &ocbInstance
     _, ok := aux.(cipher.AEAD)
     if !ok {
         t.Errorf("Error: OCB can't implement AEAD interface")
diff --git a/mode/siv/aes/siv_test.go b/mode/siv/aes/siv_test.go
@@ -151,7 +151,7 @@ func init() {
 
 // Load test vectors
 func loadAESSIVExamples(filename string) []aesSIVExample {
-    var examplesJSON map[string]interface{}
+    var examplesJSON map[string]any
 
     exampleData := testData[filename]
 
diff --git a/mode/siv/cipher_test.go b/mode/siv/cipher_test.go
@@ -291,7 +291,7 @@ func init() {
 
 // Load test vectors
 func loadAESSIVExamples(filename string) []aesSIVExample {
-    var examplesJSON map[string]interface{}
+    var examplesJSON map[string]any
 
     exampleData := testData[filename]
 
diff --git a/pkcs7/pkcs7.go b/pkcs7/pkcs7.go
@@ -66,7 +66,7 @@ type PKCS7 struct {
     Certificates []*x509.Certificate
     CRLs         []pkix.CertificateList
     Signers      []signerInfo
-    raw          interface{}
+    raw          any
 }
 
 type contentInfo struct {
@@ -131,12 +131,12 @@ func (raw rawCertificates) Parse() ([]*x509.Certificate, error) {
 // `encoding/asn1`
 type Attribute struct {
     Type  asn1.ObjectIdentifier
-    Value interface{}
+    Value any
 }
 
 type attributes struct {
     types  []asn1.ObjectIdentifier
-    values []interface{}
+    values []any
 }
 
 // Add adds the attribute, maintaining insertion order
diff --git a/tool/test/assert_test.go b/tool/test/assert_test.go
@@ -16,7 +16,7 @@ import (
 )
 
 var (
-    i     interface{}
+    i     any
     zeros = []interface{}{
         false,
         byte(0),
@@ -95,8 +95,8 @@ type AssertionTesterNonConformingObject struct {
 
 func Test_ObjectsAreEqual(t *testing.T) {
     cases := []struct {
-        expected interface{}
-        actual   interface{}
+        expected any
+        actual   any
         result   bool
     }{
         // cases that are expected to be equal
@@ -133,8 +133,8 @@ func Test_ObjectsAreEqualValues(t *testing.T) {
     now := time.Now()
 
     cases := []struct {
-        expected interface{}
-        actual   interface{}
+        expected any
+        actual   any
         result   bool
     }{
         {uint32(10), int32(10), true},
@@ -166,19 +166,19 @@ func Test_ObjectsAreEqualValues(t *testing.T) {
 }
 
 type Nested struct {
-    Exported    interface{}
-    notExported interface{}
+    Exported    any
+    notExported any
 }
 
 type S struct {
-    Exported1    interface{}
+    Exported1    any
     Exported2    Nested
-    notExported1 interface{}
+    notExported1 any
     notExported2 Nested
 }
 
 type S2 struct {
-    foo interface{}
+    foo any
 }
 
 type S3 struct {
@@ -204,8 +204,8 @@ func Test_ObjectsExportedFieldsAreEqual(t *testing.T) {
     intValue := 1
 
     cases := []struct {
-        expected interface{}
-        actual   interface{}
+        expected any
+        actual   any
         result   bool
     }{
         {S{1, Nested{2, 3}, 4, Nested{5, 6}}, S{1, Nested{2, 3}, 4, Nested{5, 6}}, true},
@@ -278,8 +278,8 @@ func Test_CopyExportedFields(t *testing.T) {
     intValue := 1
 
     cases := []struct {
-        input    interface{}
-        expected interface{}
+        input    any
+        expected any
     }{
         {
             input:    Nested{"a", "b"},
@@ -378,8 +378,8 @@ func Test_Exactly(t *testing.T) {
     c := float32(1)
     d := float32(2)
     cases := []struct {
-        expected interface{}
-        actual   interface{}
+        expected any
+        actual   any
         result   bool
     }{
         {a, b, false},
@@ -404,11 +404,11 @@ func Test_Equal(t *testing.T) {
     type myType string
 
     mockT := new(testing.T)
-    var m map[string]interface{}
+    var m map[string]any
 
     cases := []struct {
-        expected interface{}
-        actual   interface{}
+        expected any
+        actual   any
         result   bool
         remark   string
     }{
@@ -446,8 +446,8 @@ func Test_NotEqual(t *testing.T) {
     mockT := new(testing.T)
 
     cases := []struct {
-        expected interface{}
-        actual   interface{}
+        expected any
+        actual   any
         result   bool
     }{
         // cases that are expected not to match
@@ -485,8 +485,8 @@ func Test_NotEqualValues(t *testing.T) {
     mockT := new(testing.T)
 
     cases := []struct {
-        expected interface{}
-        actual   interface{}
+        expected any
+        actual   any
         result   bool
     }{
         // cases that are expected not to match
@@ -568,8 +568,8 @@ func Test_samePointers(t *testing.T) {
     p := ptr(2)
 
     type args struct {
-        first  interface{}
-        second interface{}
+        first  any
+        second any
     }
     tests := []struct {
         name string
@@ -676,7 +676,7 @@ func Test_Len(t *testing.T) {
     ch <- 3
 
     cases := []struct {
-        v               interface{}
+        v               any
         l               int
         expected1234567 string // message when expecting 1234567 items
     }{
@@ -1050,7 +1050,7 @@ func Test_NotPanics(t *testing.T) {
 
 type mockTestingT struct {
     errorFmt string
-    args     []interface{}
+    args     []any
 }
 
 func (m *mockTestingT) errorString() string {
@@ -1161,11 +1161,11 @@ func Test_ContainsNotContains(t *testing.T) {
         {"j", "k"},
     }
     simpleMap := map[interface{}]interface{}{"Foo": "Bar"}
-    var zeroMap map[interface{}]interface{}
+    var zeroMap map[interface{}]any
 
     cases := []struct {
-        expected interface{}
-        actual   interface{}
+        expected any
+        actual   any
         result   bool
     }{
         {"Hello World", "Hello", true},
@@ -1220,8 +1220,8 @@ func Test_ContainsNotContainsFailMessage(t *testing.T) {
 
     cases := []struct {
         assertion func(t TestingT, s, contains interface{}, msgAndArgs ...interface{}) bool
-        container interface{}
-        instance  interface{}
+        container any
+        instance  any
         expected  string
     }{
         {
@@ -1286,8 +1286,8 @@ func Test_ContainsNotContainsOnNilValue(t *testing.T) {
 
 func Test_SubsetNotSubset(t *testing.T) {
     cases := []struct {
-        list    interface{}
-        subset  interface{}
+        list    any
+        subset  any
         result  bool
         message string
     }{
@@ -1693,8 +1693,8 @@ func Test_ComparisonAssertionFunc(t *testing.T) {
 
     tests := []struct {
         name      string
-        expect    interface{}
-        got       interface{}
+        expect    any
+        got       any
         assertion ComparisonAssertionFunc
     }{
         {"isType", (*testing.T)(nil), t, IsType},
@@ -1718,7 +1718,7 @@ func Test_ComparisonAssertionFunc(t *testing.T) {
 func Test_ValueAssertionFunc(t *testing.T) {
     tests := []struct {
         name      string
-        value     interface{}
+        value     any
         assertion ValueAssertionFunc
     }{
         {"notNil", true, NotNil},
diff --git a/x509/boring_test.go b/x509/boring_test.go
@@ -44,7 +44,7 @@ type boringCertificate struct {
     parentOrg string
     der       []byte
     cert      *Certificate
-    key       interface{}
+    key       any
     fipsOK    bool
 }
 
@@ -95,7 +95,7 @@ func testBoringCert(t *testing.T, name string, key interface{}, parent *boringCe
     }
 
     var pcert *Certificate
-    var pkey interface{}
+    var pkey any
     if parent != nil {
         pcert = parent.cert
         pkey = parent.key
@@ -104,7 +104,7 @@ func testBoringCert(t *testing.T, name string, key interface{}, parent *boringCe
         pkey = key
     }
 
-    var pub interface{}
+    var pub any
     var desc string
     switch k := key.(type) {
     case *rsa.PrivateKey:

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ type TestExplicitIndefinite struct {`
`65`	`65`
`66`	`66`	`var berUnmarshalTestData = []struct {`
`67`	`67`	`in []byte`
`68`		`- out interface{}`
	`68`	`+ out any`
`69`	`69`	`}{`
`70`	`70`	`{`
`71`	`71`	`[]byte{0x30, 0x80, 0x31, 0x80, 0x02, 0x01, 0x01, 0x02, 0x01, 0x02, 0x02, 0x01, 0x03, 0x00, 0x00, 0x00, 0x00},`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ type sequence2Test struct {`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`type marshalTest struct {`
`132`		`- in interface{}`
	`132`	`+ in any`
`133`	`133`	`out string`
`134`	`134`	`}`
`135`	`135`
`@@ -293,7 +293,7 @@ func TestMarshal2(t *testing.T) {`
`293`	`293`	`}`
`294`	`294`
`295`	`295`	`type marshalWithOptionsTest struct {`
`296`		`- in interface{}`
	`296`	`+ in any`
`297`	`297`	`out string`
`298`	`298`	`options string`
`299`	`299`	`}`