aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMatthew Dempsky <mdempsky@google.com>2021-07-28 12:59:14 -0700
committerMatthew Dempsky <mdempsky@google.com>2021-07-28 21:41:07 +0000
commitadedf54288e826bd93ccf22ad104f768d42289d4 (patch)
tree2fe786ecc9202827525f52896b45ce1e43bbf671 /test
parent53557530093938e19c21f6b02a482939ac6e634b (diff)
downloadgo-adedf54288e826bd93ccf22ad104f768d42289d4.tar.gz
go-adedf54288e826bd93ccf22ad104f768d42289d4.zip
[dev.typeparams] test: rename blank functions
This CL renames blank functions in the test/ directory so that they don't rely on the compiler doing anything more than typechecking them. In particular, I ran this search to find files that used blank functions and methods: $ git grep -l '^func.*\b_(' | xargs grep -n '^' | grep '\.go:1:' | grep -v '// errorcheck$' I then skipped updating a few files: * blank.go * fixedbugs/issue11699.go * fixedbugs/issue29870.go These tests specifically check that blank functions/methods work. * interface/fail.go Not sure the motivation for the blank method here, but it's empty anyway. * typeparam/tparam1.go Type-checking test, but uses "-G" (to use types2 instead of typecheck). Updates #47446. Change-Id: I9ec1714f499808768bd0dcd7ae6016fb2b078e5e Reviewed-on: https://go-review.googlesource.com/c/go/+/338094 Trust: Matthew Dempsky <mdempsky@google.com> Run-TryBot: Matthew Dempsky <mdempsky@google.com> TryBot-Result: Go Bot <gobot@golang.org> Reviewed-by: Robert Griesemer <gri@golang.org>
Diffstat (limited to 'test')
-rw-r--r--test/escape5.go4
-rw-r--r--test/escape_goto.go6
-rw-r--r--test/fixedbugs/bug267.go2
-rw-r--r--test/fixedbugs/issue22076.go4
-rw-r--r--test/fixedbugs/issue27557.go6
-rw-r--r--test/fixedbugs/issue45258.go2
-rw-r--r--test/fixedbugs/issue8042.go6
-rw-r--r--test/fixedbugs/issue8761.go6
-rw-r--r--test/inline.go4
-rw-r--r--test/typeparam/issue45547.go2
-rw-r--r--test/typeparam/typelist.go14
11 files changed, 28 insertions, 28 deletions
diff --git a/test/escape5.go b/test/escape5.go
index 97aaf23b2d..089130dad5 100644
--- a/test/escape5.go
+++ b/test/escape5.go
@@ -173,13 +173,13 @@ type U int
func (*U) M() {}
func (_ *U) N() {}
-func _() {
+func fbad24305a() {
var u U
u.M()
u.N()
}
-func fbad24305() {
+func fbad24305b() {
var u U
(*U).M(&u)
(*U).N(&u)
diff --git a/test/escape_goto.go b/test/escape_goto.go
index f024a9afe3..90da5a2151 100644
--- a/test/escape_goto.go
+++ b/test/escape_goto.go
@@ -10,7 +10,7 @@ package escape
var x bool
-func _() {
+func f1() {
var p *int
loop:
if x {
@@ -22,7 +22,7 @@ loop:
_ = p
}
-func _() {
+func f2() {
var p *int
if x {
loop:
@@ -33,7 +33,7 @@ func _() {
_ = p
}
-func _() {
+func f3() {
var p *int
if x {
loop:
diff --git a/test/fixedbugs/bug267.go b/test/fixedbugs/bug267.go
index cf8bf841f8..b61216a9d5 100644
--- a/test/fixedbugs/bug267.go
+++ b/test/fixedbugs/bug267.go
@@ -10,7 +10,7 @@ type T []int
var a []bool
-func _() {
+func f1() {
if a[T{42}[0]] {
}
// if (a[T{42}[0]]) {} // this compiles
diff --git a/test/fixedbugs/issue22076.go b/test/fixedbugs/issue22076.go
index 5d628b96bd..b383a674e2 100644
--- a/test/fixedbugs/issue22076.go
+++ b/test/fixedbugs/issue22076.go
@@ -13,12 +13,12 @@ import . "bytes"
var _ Reader // use "bytes" import
-func _() {
+func f1() {
Buffer := 0
_ = Buffer
}
-func _() {
+func f2() {
for Buffer := range []int{} {
_ = Buffer
}
diff --git a/test/fixedbugs/issue27557.go b/test/fixedbugs/issue27557.go
index e35ab5a169..f609b27faa 100644
--- a/test/fixedbugs/issue27557.go
+++ b/test/fixedbugs/issue27557.go
@@ -8,19 +8,19 @@ package p
var sink interface{}
-func _() {
+func f1() {
var t T
f := t.noescape // ERROR "t.noescape does not escape"
f()
}
-func _() {
+func f2() {
var t T // ERROR "moved to heap"
f := t.escape // ERROR "t.escape does not escape"
f()
}
-func _() {
+func f3() {
var t T // ERROR "moved to heap"
f := t.returns // ERROR "t.returns does not escape"
sink = f()
diff --git a/test/fixedbugs/issue45258.go b/test/fixedbugs/issue45258.go
index f4d6fccf17..b026c0c8f5 100644
--- a/test/fixedbugs/issue45258.go
+++ b/test/fixedbugs/issue45258.go
@@ -22,7 +22,7 @@ func (r *impl) Foo() Barer {
func (r *impl) Bar() {}
-func _() {
+func f1() {
var r Fooer = &impl{}
r.Foo().Bar()
}
diff --git a/test/fixedbugs/issue8042.go b/test/fixedbugs/issue8042.go
index 5639f97bb8..be15ef06cd 100644
--- a/test/fixedbugs/issue8042.go
+++ b/test/fixedbugs/issue8042.go
@@ -9,7 +9,7 @@
package p
-func _() {
+func f1() {
goto L1
const x = 0
L1:
@@ -18,7 +18,7 @@ L1:
L2:
}
-func _() {
+func f2() {
{
goto L1
}
@@ -31,7 +31,7 @@ L1:
L2:
}
-func _(d int) {
+func f3(d int) {
if d > 0 {
goto L1
} else {
diff --git a/test/fixedbugs/issue8761.go b/test/fixedbugs/issue8761.go
index 7f458f7f03..e5130e1ff5 100644
--- a/test/fixedbugs/issue8761.go
+++ b/test/fixedbugs/issue8761.go
@@ -10,17 +10,17 @@
package p
-func _() {
+func f1() {
type C chan int
_ = [1][]C{[]C{make(chan int)}}
}
-func _() {
+func f2() {
type C interface{}
_ = [1][]C{[]C{recover()}}
}
-func _() {
+func f3() {
type C *int
_ = [1][]C{[]C{new(int)}}
}
diff --git a/test/inline.go b/test/inline.go
index 2cda07b2da..a73c0ba7b1 100644
--- a/test/inline.go
+++ b/test/inline.go
@@ -49,7 +49,7 @@ func j(x int) int { // ERROR "can inline j"
}
}
-func _() int { // ERROR "can inline _"
+func f2() int { // ERROR "can inline f2"
tmp1 := h
tmp2 := tmp1
return tmp2(0) // ERROR "inlining call to h"
@@ -167,7 +167,7 @@ func (T) meth(int, int) {} // ERROR "can inline T.meth"
func k() (T, int, int) { return T{}, 0, 0 } // ERROR "can inline k"
-func _() { // ERROR "can inline _"
+func f3() { // ERROR "can inline f3"
T.meth(k()) // ERROR "inlining call to k" "inlining call to T.meth"
// ERRORAUTO "inlining call to T.meth"
}
diff --git a/test/typeparam/issue45547.go b/test/typeparam/issue45547.go
index 0a08d66b70..b354d4d7f6 100644
--- a/test/typeparam/issue45547.go
+++ b/test/typeparam/issue45547.go
@@ -11,7 +11,7 @@ func f[T any]() (f, g T) { return f, g }
// Tests for generic function instantiation on the right hande side of multi-value
// assignments.
-func _() {
+func g() {
// Multi-value assignment within a function
var _, _ = f[int]()
}
diff --git a/test/typeparam/typelist.go b/test/typeparam/typelist.go
index 3d035bf457..a68ae1b5cd 100644
--- a/test/typeparam/typelist.go
+++ b/test/typeparam/typelist.go
@@ -69,14 +69,14 @@ func _[V any, T interface{ type map[string]V }](p T) V {
// Cannot embed stand-alone type parameters. Disabled for now.
/*
func f0[A any, B interface{type C}, C interface{type D}, D interface{type A}](A, B, C, D)
-func _() {
+func f0x() {
f := f0[string]
f("a", "b", "c", "d")
f0("a", "b", "c", "d")
}
func f1[A any, B interface{type A}](A, B)
-func _() {
+func f1x() {
f := f1[int]
f(int(0), int(0))
f1(int(0), int(0))
@@ -86,7 +86,7 @@ func _() {
*/
func f2[A any, B interface{ type []A }](_ A, _ B)
-func _() {
+func f2x() {
f := f2[byte]
f(byte(0), []byte{})
f2(byte(0), []byte{})
@@ -97,7 +97,7 @@ func _() {
// Cannot embed stand-alone type parameters. Disabled for now.
/*
func f3[A any, B interface{type C}, C interface{type *A}](a A, _ B, c C)
-func _() {
+func f3x() {
f := f3[int]
var x int
f(x, &x, &x)
@@ -106,7 +106,7 @@ func _() {
*/
func f4[A any, B interface{ type []C }, C interface{ type *A }](_ A, _ B, c C)
-func _() {
+func f4x() {
f := f4[int]
var x int
f(x, []*int{}, &x)
@@ -119,14 +119,14 @@ func f5[A interface {
c C
}
}, B any, C interface{ type *B }](x B) A
-func _() {
+func f5x() {
x := f5(1.2)
var _ float64 = x.b
var _ float64 = *x.c
}
func f6[A any, B interface{ type struct{ f []A } }](B) A
-func _() {
+func f6x() {
x := f6(struct{ f []string }{})
var _ string = x
}