all: run go 1.26's go fix (#3654)

Author: vangent

blob/azureblob/azureblob.go

@@ -197,7 +197,7 @@ func NewDefaultServiceURLOptions() *ServiceURLOptions {
 	if connectionString != "" {
 		// Parse the connection string to get a default account name and protocol.
 		// Format: DefaultEndpointsProtocol=https;AccountName=some-account;AccountKey=very-secure;EndpointSuffix=core.windows.net
-		for _, part := range strings.Split(connectionString, ";") {
+		for part := range strings.SplitSeq(connectionString, ";") {
 			keyval := strings.Split(part, "=")
 			if len(keyval) == 2 {
 				if accountName == "" && keyval[0] == "AccountName" {
@@ -764,7 +764,6 @@ func (b *bucket) ListPaged(ctx context.Context, opts *driver.ListOptions) (*driv
 	page.Objects = []*driver.ListObject{}
 	segment := resp.ListBlobsHierarchySegmentResponse.Segment
 	for _, blobPrefix := range segment.BlobPrefixes {
-		blobPrefix := blobPrefix // capture loop variable for use in AsFunc
 		page.Objects = append(page.Objects, &driver.ListObject{
 			Key:   unescapeKey(to.String(blobPrefix.Name)),
 			Size:  0,
@@ -779,7 +778,6 @@ func (b *bucket) ListPaged(ctx context.Context, opts *driver.ListOptions) (*driv
 		})
 	}
 	for _, blobInfo := range segment.BlobItems {
-		blobInfo := blobInfo // capture loop variable for use in AsFunc
 		page.Objects = append(page.Objects, &driver.ListObject{
 			Key:     unescapeKey(to.String(blobInfo.Name)),
 			ModTime: *blobInfo.Properties.LastModified,

blob/drivertest/bindata.go

@@ -114,8 +114,8 @@ func AssetDir(name string) ([]string, error) {
 	node := _bintree
 	if len(name) != 0 {
 		cannonicalName := strings.Replace(name, "\\", "/", -1)
-		pathList := strings.Split(cannonicalName, "/")
-		for _, p := range pathList {
+		pathList := strings.SplitSeq(cannonicalName, "/")
+		for p := range pathList {
 			node = node.Children[p]
 			if node == nil {
 				return nil, fmt.Errorf("Asset %s not found", name)

blob/drivertest/drivertest.go

@@ -434,7 +434,7 @@ func testList(t *testing.T, newHarness HarnessMaker) {
 		b := blob.NewBucket(drv)
 		iter := b.List(&blob.ListOptions{Prefix: keyPrefix})
 		found := iterToSetOfKeys(ctx, t, iter)
-		for i := 0; i < 3; i++ {
+		for i := range 3 {
 			key := keyForIndex(i)
 			if !found[key] {
 				if err := b.WriteAll(ctx, key, content, nil); err != nil {
@@ -2159,9 +2159,9 @@ func testConcurrentWriteAndRead(t *testing.T, newHarness HarnessMaker) {
 	const numKeys = 20
 	const dataSize = 4 * 1024
 	keyData := make(map[int][]byte)
-	for k := 0; k < numKeys; k++ {
+	for k := range numKeys {
 		data := make([]byte, dataSize)
-		for i := 0; i < dataSize; i++ {
+		for i := range dataSize {
 			data[i] = byte(k)
 		}
 		keyData[k] = data
@@ -2176,7 +2176,7 @@ func testConcurrentWriteAndRead(t *testing.T, newHarness HarnessMaker) {
 	errs := make(chan error, numKeys)
 
 	// Write all blobs concurrently.
-	for k := 0; k < numKeys; k++ {
+	for k := range numKeys {
 		wg.Add(1)
 		go func(key int) {
 			if err := b.WriteAll(ctx, blobName(key), keyData[key], nil); err != nil {
@@ -2197,7 +2197,7 @@ func testConcurrentWriteAndRead(t *testing.T, newHarness HarnessMaker) {
 	errs = make(chan error, numKeys)
 
 	// Read all blobs concurrently and verify that they contain the expected data.
-	for k := 0; k < numKeys; k++ {
+	for k := range numKeys {
 		wg.Add(1)
 		go func(key int) {
 			buf, err := b.ReadAll(ctx, blobName(key))

blob/example_test.go

@@ -199,7 +199,7 @@ func ExampleBucket_List() {
 
 	// Create some blob objects for listing: "foo[0..4].txt".
 	ctx := context.Background()
-	for i := 0; i < 5; i++ {
+	for i := range 5 {
 		if err := bucket.WriteAll(ctx, fmt.Sprintf("foo%d.txt", i), []byte("Go Cloud Development Kit"), nil); err != nil {
 			log.Fatal(err)
 		}
@@ -328,7 +328,7 @@ func ExampleBucket_ListPage() {
 
 	// Create some blob objects for listing: "foo[0..7].txt".
 	ctx := context.Background()
-	for i := 0; i < 8; i++ {
+	for i := range 8 {
 		if err := bucket.WriteAll(ctx, fmt.Sprintf("foo%d.txt", i), []byte("Go Cloud Development Kit"), nil); err != nil {
 			log.Fatal(err)
 		}

blob/fileblob/fileblob_test.go

@@ -507,8 +507,7 @@ func TestSkipMetadata(t *testing.T) {
 		{"file://" + dirpath + "?metadata=", true}, // … and explicitly.
 	}
 
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
+	ctx := t.Context()
 	for _, test := range tests {
 		b, err := blob.OpenBucket(ctx, test.URL)
 		if b != nil {

blob/gcsblob/gcsblob.go

@@ -129,7 +129,7 @@ func readDefaultCredentials(credFileAsJSON []byte) (AccessID string, PrivateKey
 	}
 	if err := json.Unmarshal(credFileAsJSON, &contentVariantB); err == nil {
 		nextFieldIsAccessID := false
-		for _, s := range strings.Split(contentVariantB.Name, "/") {
+		for s := range strings.SplitSeq(contentVariantB.Name, "/") {
 			if nextFieldIsAccessID {
 				AccessID = s
 				break

blob/memblob/memblob.go

@@ -36,6 +36,7 @@ import (
 	"gocloud.dev/internal/gcerr"
 	"hash"
 	"io"
+	"maps"
 	"net/url"
 	"sort"
 	"strings"
@@ -305,9 +306,7 @@ func (b *bucket) NewTypedWriter(ctx context.Context, key, contentType string, op
 		}
 	}
 	md := map[string]string{}
-	for k, v := range opts.Metadata {
-		md[k] = v
-	}
+	maps.Copy(md, opts.Metadata)
 
 	var md5hash hash.Hash
 	if !b.options.NoMD5 {

blob/s3blob/s3blob.go

@@ -454,7 +454,6 @@ func (b *bucket) ListPaged(ctx context.Context, opts *driver.ListOptions) (*driv
 	if n := len(resp.Contents) + len(resp.CommonPrefixes); n > 0 {
 		page.Objects = make([]*driver.ListObject, n)
 		for i, obj := range resp.Contents {
-			obj := obj
 			page.Objects[i] = &driver.ListObject{
 				Key:     unescapeKey(aws.ToString(obj.Key)),
 				ModTime: *obj.LastModified,
@@ -471,7 +470,6 @@ func (b *bucket) ListPaged(ctx context.Context, opts *driver.ListOptions) (*driv
 			}
 		}
 		for i, prefix := range resp.CommonPrefixes {
-			prefix := prefix
 			page.Objects[i+len(resp.Contents)] = &driver.ListObject{
 				Key:   unescapeKey(aws.ToString(prefix.Prefix)),
 				IsDir: true,

docstore/awsdynamodb/v2/codec.go

@@ -69,7 +69,7 @@ func (e *encoder) EncodeMap(n int) driver.Encoder {
 	return &mapEncoder{m: m}
 }
 
-var typeOfGoTime = reflect.TypeOf(time.Time{})
+var typeOfGoTime = reflect.TypeFor[time.Time]()
 
 // EncodeSpecial encodes time.Time specially.
 func (e *encoder) EncodeSpecial(v reflect.Value) (bool, error) {
@@ -135,7 +135,7 @@ func encodeDocKeyFields(doc driver.Document, pkey, skey string) (*dyn2Types.Attr
 	return &dyn2Types.AttributeValueMemberM{Value: m}, nil
 }
 
-func encodeValue(v interface{}) (dyn2Types.AttributeValue, error) {
+func encodeValue(v any) (dyn2Types.AttributeValue, error) {
 	var e encoder
 	if err := driver.Encode(reflect.ValueOf(v), &e); err != nil {
 		return nil, err
@@ -302,11 +302,11 @@ func (d decoder) DecodeMap(f func(key string, vd driver.Decoder, exactMatch bool
 	}
 }
 
-func (d decoder) AsInterface() (interface{}, error) {
+func (d decoder) AsInterface() (any, error) {
 	return toGoValue(d.av)
 }
 
-func toGoValue(av dyn2Types.AttributeValue) (interface{}, error) {
+func toGoValue(av dyn2Types.AttributeValue) (any, error) {
 	switch v := av.(type) {
 	case *dyn2Types.AttributeValueMemberNULL:
 		return nil, nil
@@ -333,7 +333,7 @@ func toGoValue(av dyn2Types.AttributeValue) (interface{}, error) {
 		return v.Value, nil
 
 	case *dyn2Types.AttributeValueMemberL:
-		s := make([]interface{}, len(v.Value))
+		s := make([]any, len(v.Value))
 		for i, v := range v.Value {
 			x, err := toGoValue(v)
 			if err != nil {
@@ -344,7 +344,7 @@ func toGoValue(av dyn2Types.AttributeValue) (interface{}, error) {
 		return s, nil
 
 	case *dyn2Types.AttributeValueMemberM:
-		m := make(map[string]interface{}, len(v.Value))
+		m := make(map[string]any, len(v.Value))
 		for k, v := range v.Value {
 			x, err := toGoValue(v)
 			if err != nil {
@@ -359,7 +359,7 @@ func toGoValue(av dyn2Types.AttributeValue) (interface{}, error) {
 	}
 }
 
-func (d decoder) AsSpecial(v reflect.Value) (bool, interface{}, error) {
+func (d decoder) AsSpecial(v reflect.Value) (bool, any, error) {
 	unsupportedTypes := `unsupported type, the docstore driver for DynamoDB does
 	not decode DynamoDB set types, such as string set, number set and binary set`
 	switch d.av.(type) {

docstore/awsdynamodb/v2/codec_test.go

@@ -49,7 +49,7 @@ func TestEncodeValue(t *testing.T) {
 	var nullptr *int
 
 	for _, test := range []struct {
-		in   interface{}
+		in   any
 		want dyn2Types.AttributeValue
 	}{
 		// null
@@ -74,7 +74,7 @@ func TestEncodeValue(t *testing.T) {
 		{[]int{}, &dyn2Types.AttributeValueMemberL{Value: []dyn2Types.AttributeValue{}}},
 		{[]int{1, 2}, avl(avn("1"), avn("2"))},
 		{[...]int{1, 2}, avl(avn("1"), avn("2"))},
-		{[]interface{}{nil, false}, avl(nullValue, &dyn2Types.AttributeValueMemberBOOL{Value: false})},
+		{[]any{nil, false}, avl(nullValue, &dyn2Types.AttributeValueMemberBOOL{Value: false})},
 		// map
 		{map[string]int(nil), nullValue},
 		{map[string]int{}, &dyn2Types.AttributeValueMemberM{Value: map[string]dyn2Types.AttributeValue{}}},
@@ -105,7 +105,7 @@ func TestDecodeValue(t *testing.T) {
 
 	for _, test := range []struct {
 		in   dyn2Types.AttributeValue
-		want interface{}
+		want any
 	}{
 		// null
 		// {nullValue, nil}, // cant reflect new, how best to test?
@@ -160,7 +160,7 @@ func TestDecodeValue(t *testing.T) {
 func TestDecodeErrorOnUnsupported(t *testing.T) {
 	for _, tc := range []struct {
 		in  dyn2Types.AttributeValue
-		out interface{}
+		out any
 	}{
 		{&dyn2Types.AttributeValueMemberSS{Value: []string{"foo", "bar"}}, []string{}},
 		{&dyn2Types.AttributeValueMemberNS{Value: []string{"1.1", "-2.2", "3.3"}}, []float64{}},
@@ -179,18 +179,18 @@ func (ct *codecTester) UnsupportedTypes() []drivertest.UnsupportedType {
 	return []drivertest.UnsupportedType{drivertest.BinarySet}
 }
 
-func (ct *codecTester) NativeEncode(obj interface{}) (interface{}, error) {
+func (ct *codecTester) NativeEncode(obj any) (any, error) {
 	return dynattr.Marshal(obj)
 }
 
-func (ct *codecTester) NativeDecode(value, dest interface{}) error {
+func (ct *codecTester) NativeDecode(value, dest any) error {
 	return dynattr.Unmarshal(value.(dyn2Types.AttributeValue), dest)
 }
 
-func (ct *codecTester) DocstoreEncode(obj interface{}) (interface{}, error) {
+func (ct *codecTester) DocstoreEncode(obj any) (any, error) {
 	return encodeDoc(drivertest.MustDocument(obj))
 }
 
-func (ct *codecTester) DocstoreDecode(value, dest interface{}) error {
+func (ct *codecTester) DocstoreDecode(value, dest any) error {
 	return decodeDoc(value.(dyn2Types.AttributeValue), drivertest.MustDocument(dest))
 }