Update golang.org/x/* deps for import

11 files changed, 3 insertions, 15 deletions

diff --git a/vendor/golang.org/x/text/internal/export/idna/conformance_test.go b/vendor/golang.org/x/text/internal/export/idna/conformance_test.go
index 3e0e87518d..8ced0e797f 100644
--- a/vendor/golang.org/x/text/internal/export/idna/conformance_test.go
+++ b/vendor/golang.org/x/text/internal/export/idna/conformance_test.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build go1.10
-// +build go1.10
 
 package idna
 
diff --git a/vendor/golang.org/x/text/internal/export/idna/gen10.0.0_test.go b/vendor/golang.org/x/text/internal/export/idna/gen10.0.0_test.go
index 0ac9497d33..c5ace90386 100644
--- a/vendor/golang.org/x/text/internal/export/idna/gen10.0.0_test.go
+++ b/vendor/golang.org/x/text/internal/export/idna/gen10.0.0_test.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build go1.10
-// +build go1.10
 
 package idna
 
diff --git a/vendor/golang.org/x/text/internal/export/idna/go118.go b/vendor/golang.org/x/text/internal/export/idna/go118.go
index 941a7aaffa..7fd4392883 100644
--- a/vendor/golang.org/x/text/internal/export/idna/go118.go
+++ b/vendor/golang.org/x/text/internal/export/idna/go118.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build go1.18
-// +build go1.18
 
 package idna
 
diff --git a/vendor/golang.org/x/text/internal/export/idna/idna10.0.0.go b/vendor/golang.org/x/text/internal/export/idna/idna10.0.0.go
index 0e7571d167..bda6ca2855 100644
--- a/vendor/golang.org/x/text/internal/export/idna/idna10.0.0.go
+++ b/vendor/golang.org/x/text/internal/export/idna/idna10.0.0.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build go1.10
-// +build go1.10
 
 //go:generate go run gen.go gen_trieval.go gen_common.go
 
diff --git a/vendor/golang.org/x/text/internal/export/idna/idna10.0.0_test.go b/vendor/golang.org/x/text/internal/export/idna/idna10.0.0_test.go
index c3365bc6a3..8a018e0e0f 100644
--- a/vendor/golang.org/x/text/internal/export/idna/idna10.0.0_test.go
+++ b/vendor/golang.org/x/text/internal/export/idna/idna10.0.0_test.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build go1.10
-// +build go1.10
 
 package idna
 
diff --git a/vendor/golang.org/x/text/internal/export/idna/tables15.0.0.go b/vendor/golang.org/x/text/internal/export/idna/tables15.0.0.go
index 40033778f0..5ff05fe1af 100644
--- a/vendor/golang.org/x/text/internal/export/idna/tables15.0.0.go
+++ b/vendor/golang.org/x/text/internal/export/idna/tables15.0.0.go
@@ -1,7 +1,6 @@
 // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
 
 //go:build go1.21
-// +build go1.21
 
 package idna
 
diff --git a/vendor/golang.org/x/text/internal/export/idna/trie13.0.0.go b/vendor/golang.org/x/text/internal/export/idna/trie13.0.0.go
index 4a52c8b2eb..1acfc1738e 100644
--- a/vendor/golang.org/x/text/internal/export/idna/trie13.0.0.go
+++ b/vendor/golang.org/x/text/internal/export/idna/trie13.0.0.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build go1.16
-// +build go1.16
 
 package idna
 
diff --git a/vendor/golang.org/x/text/internal/gen/gen.go b/vendor/golang.org/x/text/internal/gen/gen.go
index faa7092723..78bfef6216 100644
--- a/vendor/golang.org/x/text/internal/gen/gen.go
+++ b/vendor/golang.org/x/text/internal/gen/gen.go
@@ -277,11 +277,9 @@ func fileToPattern(filename string) string {
 	return fmt.Sprint(prefix, "%s", suffix)
 }
 
-// tagLines returns the //go:build and // +build lines to add to the file.
+// tagLines returns the //go:build lines to add to the file.
 func tagLines(tags string) string {
-	newTags := strings.ReplaceAll(tags, ",", " && ")
-	return "//go:build " + newTags + "\n" +
-		"// +build " + tags + "\n"
+	return "//go:build " + strings.ReplaceAll(tags, ",", " && ") + "\n"
 }
 
 func updateBuildTags(pattern string) {
@@ -291,7 +289,7 @@ func updateBuildTags(pattern string) {
 		if err != nil {
 			continue
 		}
-		b = regexp.MustCompile(`((//go:build|// \+build).*\n)+`).ReplaceAll(b, []byte(tagLines(t.buildTags)))
+		b = regexp.MustCompile(`//go:build.*\n`).ReplaceAll(b, []byte(tagLines(t.buildTags)))
 		err = os.WriteFile(oldFile, b, 0644)
 		if err != nil {
 			log.Fatal(err)
diff --git a/vendor/golang.org/x/text/internal/testtext/gc.go b/vendor/golang.org/x/text/internal/testtext/gc.go
index a6365f9b4c..93a7b4d587 100644
--- a/vendor/golang.org/x/text/internal/testtext/gc.go
+++ b/vendor/golang.org/x/text/internal/testtext/gc.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !gccgo
-// +build !gccgo
 
 package testtext
 
diff --git a/vendor/golang.org/x/text/internal/testtext/go1_7.go b/vendor/golang.org/x/text/internal/testtext/go1_7.go
index 228bf42495..8153af67c7 100644
--- a/vendor/golang.org/x/text/internal/testtext/go1_7.go
+++ b/vendor/golang.org/x/text/internal/testtext/go1_7.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build go1.7
-// +build go1.7
 
 package testtext
 
diff --git a/vendor/golang.org/x/text/internal/triegen/data_test.go b/vendor/golang.org/x/text/internal/triegen/data_test.go
index a47efacd05..5e16c09b78 100644
--- a/vendor/golang.org/x/text/internal/triegen/data_test.go
+++ b/vendor/golang.org/x/text/internal/triegen/data_test.go
@@ -1,6 +1,5 @@
 // This file is generated with "go test -tags generate". DO NOT EDIT!
 //go:build !generate
-// +build !generate
 
 package triegen_test