[dev.boringcrypto] all: merge master into dev.boringcrypto

[gostls13.git] / src / runtime / race / testdata / mop_test.go

diff --git a/src/runtime/race/testdata/mop_test.go b/src/runtime/race/testdata/mop_test.go
index b60cabfe86aacc506efd984b5af6efd3ea0ac220..94b6e58de093dd1c017b8c15b4dd4ca988a011bc 100644 (file)
--- a/src/runtime/race/testdata/mop_test.go
+++ b/src/runtime/race/testdata/mop_test.go
@@ -255,7 +255,7 @@ func TestRaceCaseIssue6418(t *testing.T) {
 
 func TestRaceCaseType(t *testing.T) {
        var x, y int
-       var i interface{} = x
+       var i any = x
        c := make(chan int, 1)
        go func() {
                switch i.(type) {
@@ -270,7 +270,7 @@ func TestRaceCaseType(t *testing.T) {
 
 func TestRaceCaseTypeBody(t *testing.T) {
        var x, y int
-       var i interface{} = &x
+       var i any = &x
        c := make(chan int, 1)
        go func() {
                switch i := i.(type) {
@@ -288,8 +288,8 @@ func TestRaceCaseTypeIssue5890(t *testing.T) {
        // spurious extra instrumentation of the initial interface
        // value.
        var x, y int
-       m := make(map[int]map[int]interface{})
-       m[0] = make(map[int]interface{})
+       m := make(map[int]map[int]any)
+       m[0] = make(map[int]any)
        c := make(chan int, 1)
        go func() {
                switch i := m[0][1].(type) {
@@ -758,7 +758,7 @@ func TestRaceStructFieldRW3(t *testing.T) {
 }
 
 func TestRaceEfaceWW(t *testing.T) {
-       var a, b interface{}
+       var a, b any
        ch := make(chan bool, 1)
        go func() {
                a = 1
@@ -810,7 +810,7 @@ func TestRaceEfaceConv(t *testing.T) {
        c := make(chan bool)
        v := 0
        go func() {
-               go func(x interface{}) {
+               go func(x any) {
                }(v)
                c <- true
        }()
@@ -1127,7 +1127,7 @@ func TestRaceRune(t *testing.T) {
 
 func TestRaceEmptyInterface1(t *testing.T) {
        c := make(chan bool)
-       var x interface{}
+       var x any
        go func() {
                x = nil
                c <- true
@@ -1138,7 +1138,7 @@ func TestRaceEmptyInterface1(t *testing.T) {
 
 func TestRaceEmptyInterface2(t *testing.T) {
        c := make(chan bool)
-       var x interface{}
+       var x any
        go func() {
                x = &Point{}
                c <- true
@@ -1579,7 +1579,7 @@ func TestRaceAddrExpr(t *testing.T) {
 func TestRaceTypeAssert(t *testing.T) {
        c := make(chan bool, 1)
        x := 0
-       var i interface{} = x
+       var i any = x
        go func() {
                y := 0
                i = y