remove go1.16 build-tag

Remove the go1.16 build-tag, as go1.16 and before reached EOL. Some changes were needed in the generator code, as it would otherwise produce a new "tables.go" file instead of updating the versioned one. Signed-off-by: Sebastiaan van Stijn <[email protected]>
golang · Oct 13, 2022 · a7b35a8 · a7b35a8
1 parent 45d33be
commit a7b35a8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 14 deletions.
diff --git a/cases/tables13.0.0.go b/cases/tables13.0.0.go
diff --git a/cases/tables13.0.0_test.go b/cases/tables13.0.0_test.go
diff --git a/internal/gen/code.go b/internal/gen/code.go
@@ -64,18 +64,15 @@ func (w *CodeWriter) WriteGoFile(filename, pkg string) {
 // structures and writes it as a Go file to the given file with the given
 // package name and build tags for the current Unicode version,
 func (w *CodeWriter) WriteVersionedGoFile(filename, pkg string) {
-	tags := buildTags()
-	if tags != "" {
-		pattern := fileToPattern(filename)
-		updateBuildTags(pattern)
-		filename = fmt.Sprintf(pattern, UnicodeVersion())
-	}
+	pattern := fileToPattern(filename)
+	updateBuildTags(pattern)
+	filename = fmt.Sprintf(pattern, UnicodeVersion())
 	f, err := os.Create(filename)
 	if err != nil {
 		log.Fatalf("Could not create file %s: %v", filename, err)
 	}
 	defer f.Close()
-	if _, err = w.WriteGo(f, pkg, tags); err != nil {
+	if _, err = w.WriteGo(f, pkg, buildTags()); err != nil {
 		log.Fatalf("Error writing file %s: %v", filename, err)
 	}
 }

diff --git a/internal/gen/gen.go b/internal/gen/gen.go
@@ -83,7 +83,7 @@ func CLDRVersion() string {
 }
 
 var tags = []struct{ version, buildTags string }{
-	{"13.0.0", "go1.16"},
+	{"13.0.0", ""},
 }
 
 // buildTags reports the build tags used for the current Unicode version.