all: use reflect.TypeFor instead of reflect.TypeOf

For golang/go#60088.

Change-Id: Ifbea6ba534dd6037dff028c0a52b210fc0076ae1
Reviewed-on: https://go-review.googlesource.com/c/text/+/709196
Reviewed-by: Sean Liao <[email protected]>
LUCI-TryBot-Result: Go LUCI <[email protected]>
Reviewed-by: Dmitri Shuralyov <[email protected]>
Reviewed-by: David Chase <[email protected]>
Auto-Submit: Sean Liao <[email protected]>

Author: cuishuang

collate/build/contract.go

@@ -282,7 +282,7 @@ func print(t *colltab.ContractTrieSet, w io.Writer, name string) (n, size int, e
 
 	update3(printArray(*t, w, name))
 	update2(fmt.Fprintf(w, "var %sContractTrieSet = ", name))
-	update3(printStruct(*t, w, name))
+	update3(printStruct(w, name))
 	update2(fmt.Fprintln(w))
 	return
 }
@@ -305,8 +305,8 @@ func printArray(ct colltab.ContractTrieSet, w io.Writer, name string) (n, size i
 	return
 }
 
-func printStruct(ct colltab.ContractTrieSet, w io.Writer, name string) (n, size int, err error) {
+func printStruct(w io.Writer, name string) (n, size int, err error) {
 	n, err = fmt.Fprintf(w, "colltab.ContractTrieSet( %sCTEntries[:] )", name)
-	size = int(reflect.TypeOf(ct).Size())
+	size = int(reflect.TypeFor[colltab.ContractTrieSet]().Size())
 	return
 }

collate/build/table.go

@@ -64,7 +64,7 @@ func printColElems(w io.Writer, a []uint32, name string) (n, sz int, err error)
 			err = e
 		}
 	}
-	sz = len(a) * int(reflect.TypeOf(uint32(0)).Size())
+	sz = len(a) * int(reflect.TypeFor[uint32]().Size())
 	p("// %s: %d entries, %d bytes\n", name, len(a), sz)
 	p("var %s = [%d]uint32 {", name, len(a))
 	for i, c := range a {

collate/build/trie.go

@@ -285,6 +285,6 @@ func (t *trie) printArrays(w io.Writer, name string) (n, size int, err error) {
 func (t *trie) printStruct(w io.Writer, handle *trieHandle, name string) (n, sz int, err error) {
 	const msg = "trie{ %sLookup[%d:], %sValues[%d:], %sLookup[:], %sValues[:]}"
 	n, err = fmt.Fprintf(w, msg, name, handle.lookupStart*blockSize, name, handle.valueStart*blockSize, name, name)
-	sz += int(reflect.TypeOf(trie{}).Size())
+	sz += int(reflect.TypeFor[trie]().Size())
 	return
 }

internal/cldrtree/generate.go

@@ -50,7 +50,7 @@ func generate(b *Builder, t *Tree, w *gen.CodeWriter) error {
 		fmt.Fprintf(w, "bucket%d,\n", i)
 	}
 	fmt.Fprint(w, "}\n\n")
-	w.Size += int(reflect.TypeOf("").Size()) * len(t.Buckets)
+	w.Size += int(reflect.TypeFor[string]().Size()) * len(t.Buckets)
 
 	// Generate string buckets.
 	for i, bucket := range t.Buckets {

internal/language/compact/language_test.go

@@ -20,15 +20,14 @@ func mustParse(s string) Tag {
 }
 
 func TestTagSize(t *testing.T) {
-	id := Tag{}
-	typ := reflect.TypeOf(id)
+	typ := reflect.TypeFor[Tag]()
 	if typ.Size() > 24 {
 		t.Errorf("size of Tag was %d; want 24", typ.Size())
 	}
 }
 
 func TestNoPublic(t *testing.T) {
-	noExportedField(t, reflect.TypeOf(Tag{}))
+	noExportedField(t, reflect.TypeFor[Tag]())
 }
 
 func noExportedField(t *testing.T, typ reflect.Type) {

internal/language/language_test.go

@@ -12,8 +12,7 @@ import (
 )
 
 func TestTagSize(t *testing.T) {
-	id := Tag{}
-	typ := reflect.TypeOf(id)
+	typ := reflect.TypeFor[Tag]()
 	if typ.Size() > 32 {
 		t.Errorf("size of Tag was %d; want <= 32", typ.Size())
 	}

language/language_test.go

@@ -10,8 +10,7 @@ import (
 )
 
 func TestTagSize(t *testing.T) {
-	id := Tag{}
-	typ := reflect.TypeOf(id)
+	typ := reflect.TypeFor[Tag]()
 	if typ.Size() > 24 {
 		t.Errorf("size of Tag was %d; want 24", typ.Size())
 	}

unicode/cldr/slice.go

@@ -36,7 +36,7 @@ func MakeSlice(slicePtr interface{}) Slice {
 	if sl.Kind() != reflect.Slice {
 		panic(fmt.Sprintf("MakeSlice: argument must point to a slice, found %v", sl.Type()))
 	}
-	intf := reflect.TypeOf((*Elem)(nil)).Elem()
+	intf := reflect.TypeFor[Elem]()
 	if !sl.Type().Elem().Implements(intf) {
 		panic(fmt.Sprintf("MakeSlice: element type of slice (%v) does not implement Elem", sl.Type().Elem()))
 	}