aboutsummaryrefslogtreecommitdiff
path: root/test/init.go
diff options
context:
space:
mode:
authorRobert Griesemer <gri@golang.org>2020-12-14 11:53:55 -0800
committerRobert Griesemer <gri@golang.org>2020-12-14 12:13:36 -0800
commit91803a2df334ddfc9377ef4d07cc5f0eff51b6a2 (patch)
tree277500790211cdab0ee3f12e1833efa44495afbc /test/init.go
parenta20021227e987a24d3dbac5118a9dee4d90a96ff (diff)
parent89f38323faa57d3f7475016f778be69fcffbe9fb (diff)
downloadgo-91803a2df334ddfc9377ef4d07cc5f0eff51b6a2.tar.gz
go-91803a2df334ddfc9377ef4d07cc5f0eff51b6a2.zip
[dev.typeparams] merge: merge branch 'dev.regabi' into 'dev.typeparams'
The following files had merge conflicts and were merged manually: src/cmd/compile/fmtmap_test.go src/cmd/compile/internal/gc/noder.go src/go/parser/error_test.go test/assign.go test/chan/perm.go test/fixedbugs/issue22822.go test/fixedbugs/issue4458.go test/init.go test/interface/explicit.go test/map1.go test/method2.go The following files had manual changes to make tests pass: test/run.go test/used.go src/cmd/compile/internal/types2/stdlib_test.go Change-Id: Ia495aaaa80ce321ee4ec2a9105780fbe913dbd4c
Diffstat (limited to 'test/init.go')
-rw-r--r--test/init.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/init.go b/test/init.go
index c2c25c7860..43bb3c6503 100644
--- a/test/init.go
+++ b/test/init.go
@@ -14,6 +14,6 @@ func init() {
func main() {
init() // ERROR "undefined.*init"
- runtime.init() // ERROR "undefined.*runtime\.init|undefined: runtime"
+ runtime.init() // ERROR "undefined.*runtime\.init|reference to undefined name|undefined: runtime"
var _ = init // ERROR "undefined.*init"
}