tpl: Sync Go template packages with the Go 1.22.5 source

diff --git a/scripts/fork_go_templates/main.go b/scripts/fork_go_templates/main.go
index 38e81ac9ddd4d9720317dd5424bb61d73cc88201..476fe480be69d06f3356c23303b8713a85ba5651 100644 (file)
--- a/scripts/fork_go_templates/main.go
+++ b/scripts/fork_go_templates/main.go
@@ -16,7 +16,7 @@ import (
 )
 
 func main() {
-       // The current is built with db6097f8cb [release-branch.go1.22] go1.22.1
+       // The current is built with 8e1fdea8316d840fd07e9d6e026048e53290948b go1.22.5
        // TODO(bep) preserve the staticcheck.conf file.
        fmt.Println("Forking ...")
        defer fmt.Println("Done ...")

diff --git a/tpl/internal/go_templates/testenv/testenv.go b/tpl/internal/go_templates/testenv/testenv.go
index 97d897a1f3c3bc18e36b9c302162aa4102b8ac2e..277df2255f8ef0406f0373696e840b4b4ffebe6c 100644 (file)
--- a/tpl/internal/go_templates/testenv/testenv.go
+++ b/tpl/internal/go_templates/testenv/testenv.go
@@ -320,6 +320,7 @@ func MustInternalLink(t testing.TB, withCgo bool) {
 // If not, MustHaveBuildMode calls t.Skip with an explanation.
 // Modified by Hugo (not needed)
 func MustHaveBuildMode(t testing.TB, buildmode string) {
+       return
 }
 
 // HasSymlink reports whether the current system can use os.Symlink.

diff --git a/tpl/internal/go_templates/testenv/testenv_test.go b/tpl/internal/go_templates/testenv/testenv_test.go
index d4b2b368f3730cde86acabd9596488f8b7645f01..4aabc00a61885369e52c683e6e050a2c92575e3c 100644 (file)
--- a/tpl/internal/go_templates/testenv/testenv_test.go
+++ b/tpl/internal/go_templates/testenv/testenv_test.go
@@ -54,7 +54,7 @@ func TestGoToolLocation(t *testing.T) {
        }
 }
 
-// Modified by Hugo.
+// Modified by Hugo (not needed)
 func TestHasGoBuild(t *testing.T) {
 }
 

diff --git a/tpl/internal/go_templates/texttemplate/exec_test.go b/tpl/internal/go_templates/texttemplate/exec_test.go
index 030e20ca0a4bedc0e85a2709c7082366bd946cac..ed75adacb6ac43c6f80606dc8eb959097cfb5890 100644 (file)
--- a/tpl/internal/go_templates/texttemplate/exec_test.go
+++ b/tpl/internal/go_templates/texttemplate/exec_test.go
@@ -2,9 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.13 && !windows
-// +build go1.13,!windows
-
 package template
 
 import (

diff --git a/tpl/internal/go_templates/texttemplate/parse/parse_test.go b/tpl/internal/go_templates/texttemplate/parse/parse_test.go
index 080eea2f971d90c8ad82e83273f1409a4b4fdc85..59e0a17412235b1c2645543e49e02c0b5ff9827b 100644 (file)
--- a/tpl/internal/go_templates/texttemplate/parse/parse_test.go
+++ b/tpl/internal/go_templates/texttemplate/parse/parse_test.go
@@ -2,9 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build go1.13
-// +build go1.13
-
 package parse
 
 import (