From de65196495017077eb8407682d46d944349b6757 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Sun, 24 Dec 2023 23:47:23 +0100 Subject: [PATCH] fix support for go1.22rc1 In early December, a new internal package linknamed from runtime was introduced, internal/chacha8rand. Re-generate the tables. Note that due to the same group of CLs and refactors, math/rand and net are no longer linknamed from runtime in Go 1.22. They are still in Go 1.21, so keep those entries around for now. We can remove math/rand/v2, as it doesn't yet exist in 1.21. Fixes #820. --- .github/workflows/test.yml | 2 +- go_std_tables.go | 9 +++++---- scripts/gen-go-std-tables.sh | 3 +++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e71565e..00645cb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -91,7 +91,7 @@ jobs: - uses: actions/checkout@v4 - name: Install Go env: - GO_COMMIT: de5b418bea70aaf27de1f47e9b5813940d1e15a4 # 2023-12-02 + GO_COMMIT: 2184a394777ccc9ce9625932b2ad773e6e626be0 # 2023-12-21 run: | cd $HOME mkdir $HOME/gotip diff --git a/go_std_tables.go b/go_std_tables.go index 9709571..6d801f0 100644 --- a/go_std_tables.go +++ b/go_std_tables.go @@ -1,6 +1,6 @@ // Code generated by scripts/gen-go-std-tables.sh; DO NOT EDIT. -// Generated from Go version devel go1.22-de5b418bea Sat Dec 2 03:15:03 2023 +0000. +// Generated from Go version devel go1.22-a2a2c5b947 Wed Dec 20 02:18:50 2023 +0000. package main @@ -10,6 +10,7 @@ var runtimeAndDeps = map[string]bool{ "internal/abi": true, "internal/cpu": true, "internal/bytealg": true, + "internal/chacha8rand": true, "internal/coverage/rtcov": true, "internal/godebugs": true, "internal/goexperiment": true, @@ -36,9 +37,6 @@ var runtimeLinknamed = []string{ "internal/syscall/unix", "internal/syscall/windows", "maps", - "math/rand", - "math/rand/v2", - "net", "os", "os/signal", "plugin", @@ -53,6 +51,9 @@ var runtimeLinknamed = []string{ "syscall", "syscall/js", "time", + // Existed in Go 1.21; removed in Go 1.22. + "math/rand", + "net", } var compilerIntrinsicsPkgs = map[string]bool{ diff --git a/scripts/gen-go-std-tables.sh b/scripts/gen-go-std-tables.sh index 892b9d3..6348025 100755 --- a/scripts/gen-go-std-tables.sh +++ b/scripts/gen-go-std-tables.sh @@ -43,6 +43,9 @@ var runtimeLinknamed = []string{ $(for path in ${runtime_linknamed}; do echo "\"${path}\"", done) + // Existed in Go 1.21; removed in Go 1.22. + "math/rand", + "net", } var compilerIntrinsicsPkgs = map[string]bool{