all: eliminate vet diagnostics

seankhliao · seankhliao · commit 16f85a7ff268 · 2025-11-14T12:24:27.000-08:00
For golang/go#74011 Change-Id: Ib98bdd5ff547879d6695cec2f3cb40b52baac736 Reviewed-on: https://go-review.googlesource.com/c/text/+/714223 Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org> Reviewed-by: Dmitri Shuralyov <dmitshur@google.com> Reviewed-by: Junyang Shao <shaojunyang@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
diff --git a/collate/collate.go b/collate/collate.go
@@ -255,7 +255,6 @@ func (i *iter) nextPrimary() int {
 			return 0
 		}
 	}
-	panic("should not reach here")
 }
 
 func (i *iter) nextSecondary() int {
diff --git a/currency/currency_test.go b/currency/currency_test.go
@@ -166,7 +166,7 @@ func getSize(t *testing.T, main string) int {
 }
 
 func BenchmarkString(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		USD.String()
+	for b.Loop() {
+		_ = USD.String()
 	}
 }
diff --git a/date/tables.go b/date/tables.go
diff --git a/encoding/ianaindex/ascii.go b/encoding/ianaindex/ascii.go
@@ -66,8 +66,8 @@ func (d asciiEncoder) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, er
 
 var asciiEnc = &internal.Encoding{
 	Encoding: &internal.SimpleEncoding{
-		asciiDecoder{},
-		asciiEncoder{},
+		Decoder: asciiDecoder{},
+		Encoder: asciiEncoder{},
 	},
 	Name: "US-ASCII",
 	MIB:  identifier.ASCII,
diff --git a/encoding/japanese/eucjp.go b/encoding/japanese/eucjp.go
@@ -17,9 +17,9 @@ import (
 var EUCJP encoding.Encoding = &eucJP
 
 var eucJP = internal.Encoding{
-	&internal.SimpleEncoding{eucJPDecoder{}, eucJPEncoder{}},
-	"EUC-JP",
-	identifier.EUCPkdFmtJapanese,
+	Encoding: &internal.SimpleEncoding{Decoder: eucJPDecoder{}, Encoder: eucJPEncoder{}},
+	Name:     "EUC-JP",
+	MIB:      identifier.EUCPkdFmtJapanese,
 }
 
 type eucJPDecoder struct{ transform.NopResetter }
diff --git a/encoding/japanese/iso2022jp.go b/encoding/japanese/iso2022jp.go
@@ -17,9 +17,9 @@ import (
 var ISO2022JP encoding.Encoding = &iso2022JP
 
 var iso2022JP = internal.Encoding{
-	internal.FuncEncoding{iso2022JPNewDecoder, iso2022JPNewEncoder},
-	"ISO-2022-JP",
-	identifier.ISO2022JP,
+	Encoding: internal.FuncEncoding{Decoder: iso2022JPNewDecoder, Encoder: iso2022JPNewEncoder},
+	Name:     "ISO-2022-JP",
+	MIB:      identifier.ISO2022JP,
 }
 
 func iso2022JPNewDecoder() transform.Transformer {
diff --git a/encoding/japanese/shiftjis.go b/encoding/japanese/shiftjis.go
@@ -18,9 +18,9 @@ import (
 var ShiftJIS encoding.Encoding = &shiftJIS
 
 var shiftJIS = internal.Encoding{
-	&internal.SimpleEncoding{shiftJISDecoder{}, shiftJISEncoder{}},
-	"Shift JIS",
-	identifier.ShiftJIS,
+	Encoding: &internal.SimpleEncoding{Decoder: shiftJISDecoder{}, Encoder: shiftJISEncoder{}},
+	Name:     "Shift JIS",
+	MIB:      identifier.ShiftJIS,
 }
 
 type shiftJISDecoder struct{ transform.NopResetter }
diff --git a/encoding/korean/euckr.go b/encoding/korean/euckr.go
@@ -20,9 +20,9 @@ var All = []encoding.Encoding{EUCKR}
 var EUCKR encoding.Encoding = &eucKR
 
 var eucKR = internal.Encoding{
-	&internal.SimpleEncoding{eucKRDecoder{}, eucKREncoder{}},
-	"EUC-KR",
-	identifier.EUCKR,
+	Encoding: &internal.SimpleEncoding{Decoder: eucKRDecoder{}, Encoder: eucKREncoder{}},
+	Name:     "EUC-KR",
+	MIB:      identifier.EUCKR,
 }
 
 type eucKRDecoder struct{ transform.NopResetter }
diff --git a/encoding/simplifiedchinese/gbk.go b/encoding/simplifiedchinese/gbk.go
@@ -22,21 +22,21 @@ var (
 )
 
 var gbk = internal.Encoding{
-	&internal.SimpleEncoding{
-		gbkDecoder{gb18030: false},
-		gbkEncoder{gb18030: false},
+	Encoding: &internal.SimpleEncoding{
+		Decoder: gbkDecoder{gb18030: false},
+		Encoder: gbkEncoder{gb18030: false},
 	},
-	"GBK",
-	identifier.GBK,
+	Name: "GBK",
+	MIB:  identifier.GBK,
 }
 
 var gbk18030 = internal.Encoding{
-	&internal.SimpleEncoding{
-		gbkDecoder{gb18030: true},
-		gbkEncoder{gb18030: true},
+	Encoding: &internal.SimpleEncoding{
+		Decoder: gbkDecoder{gb18030: true},
+		Encoder: gbkEncoder{gb18030: true},
 	},
-	"GB18030",
-	identifier.GB18030,
+	Name: "GB18030",
+	MIB:  identifier.GB18030,
 }
 
 type gbkDecoder struct {
diff --git a/encoding/simplifiedchinese/hzgb2312.go b/encoding/simplifiedchinese/hzgb2312.go
@@ -17,9 +17,9 @@ import (
 var HZGB2312 encoding.Encoding = &hzGB2312
 
 var hzGB2312 = internal.Encoding{
-	internal.FuncEncoding{hzGB2312NewDecoder, hzGB2312NewEncoder},
-	"HZ-GB2312",
-	identifier.HZGB2312,
+	Encoding: internal.FuncEncoding{Decoder: hzGB2312NewDecoder, Encoder: hzGB2312NewEncoder},
+	Name:     "HZ-GB2312",
+	MIB:      identifier.HZGB2312,
 }
 
 func hzGB2312NewDecoder() transform.Transformer {
diff --git a/encoding/traditionalchinese/big5.go b/encoding/traditionalchinese/big5.go
@@ -20,9 +20,9 @@ var All = []encoding.Encoding{Big5}
 var Big5 encoding.Encoding = &big5
 
 var big5 = internal.Encoding{
-	&internal.SimpleEncoding{big5Decoder{}, big5Encoder{}},
-	"Big5",
-	identifier.Big5,
+	Encoding: &internal.SimpleEncoding{Decoder: big5Decoder{}, Encoder: big5Encoder{}},
+	Name:     "Big5",
+	MIB:      identifier.Big5,
 }
 
 type big5Decoder struct{ transform.NopResetter }
diff --git a/encoding/unicode/unicode.go b/encoding/unicode/unicode.go
@@ -60,9 +60,9 @@ func (utf8bomEncoding) NewDecoder() *encoding.Decoder {
 }
 
 var utf8enc = &internal.Encoding{
-	&internal.SimpleEncoding{utf8Decoder{}, runes.ReplaceIllFormed()},
-	"UTF-8",
-	identifier.UTF8,
+	Encoding: &internal.SimpleEncoding{Decoder: utf8Decoder{}, Encoder: runes.ReplaceIllFormed()},
+	Name:     "UTF-8",
+	MIB:      identifier.UTF8,
 }
 
 type utf8bomDecoder struct {
diff --git a/internal/cldrtree/generate.go b/internal/cldrtree/generate.go
@@ -19,7 +19,7 @@ func generate(b *Builder, t *Tree, w *gen.CodeWriter) error {
 	fmt.Fprintln(w, `import "golang.org/x/text/internal/cldrtree"`)
 	fmt.Fprintln(w)
 
-	fmt.Fprintf(w, "var tree = &cldrtree.Tree{locales, indices, buckets}\n\n")
+	fmt.Fprintf(w, "var tree = &cldrtree.Tree{Locales: locales, Indices: indices, Buckets: buckets}\n\n")
 
 	w.WriteComment("Path values:\n%s", b.stats())
 	fmt.Fprintln(w)
diff --git a/internal/cldrtree/testdata/test1/output.go b/internal/cldrtree/testdata/test1/output.go
diff --git a/internal/cldrtree/testdata/test2/output.go b/internal/cldrtree/testdata/test2/output.go
diff --git a/internal/colltab/collelem.go b/internal/colltab/collelem.go
@@ -71,8 +71,6 @@ func (ce Elem) ctype() ceType {
 		}
 		return ceDecompose
 	}
-	panic("should not reach here")
-	return ceType(-1)
 }
 
 // For normal collation elements, we assume that a collation element either has
diff --git a/unicode/cldr/resolve.go b/unicode/cldr/resolve.go
@@ -158,7 +158,6 @@ func walkXPath(e Elem, path string) (res Elem, err error) {
 		if c == ".." {
 			if e = e.enclosing(); e == nil {
 				panic("path ..")
-				return nil, fmt.Errorf(`cldr: ".." moves past root in path %q`, path)
 			}
 			continue
 		} else if c == "" {

Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,6 @@ func (i *iter) nextPrimary() int {`
`255`	`255`	`return 0`
`256`	`256`	`}`
`257`	`257`	`}`
`258`		`- panic("should not reach here")`
`259`	`258`	`}`
`260`	`259`
`261`	`260`	`func (i *iter) nextSecondary() int {`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ func getSize(t *testing.T, main string) int {`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`func BenchmarkString(b *testing.B) {`
`169`		`- for i := 0; i < b.N; i++ {`
`170`		`- USD.String()`
	`169`	`+ for b.Loop() {`
	`170`	`+ _ = USD.String()`
`171`	`171`	`}`
`172`	`172`	`}`