Skip to content

Commit 08377b1

Browse files
ggilmoreggilmore
committed
go: upgrade to Go 1.26.4 and run go fix ./...
1 parent 2a185a5 commit 08377b1

7 files changed

Lines changed: 41 additions & 45 deletions

File tree

‎cmd/src/code_intel_upload_vendored.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ func uploadMultipartIndexParts(ctx context.Context, httpClient upload.Client, op
176176
}
177177

178178
for i, reader := range readers {
179-
i, reader := i, reader
180179

181180
pool.Go(func(ctx context.Context) error {
182181
// Determine size of this reader. If we're not the last reader in the slice,

‎cmd/src/snapshot_upload.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,8 +292,6 @@ func uploadFilesToBucket(client *gcsClient, args *uploadArgs, openedFiles []uplo
292292
// Upload each file in parallel
293293
for fileIndex, openedFile := range openedFiles {
294294

295-
openedFile := openedFile
296-
297295
uploadPool.Go(func(ctx context.Context) error {
298296
progressFn := func(bytesWritten int64) { progress.SetValue(fileIndex, float64(bytesWritten)) }
299297

‎internal/api/api.go‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"net/url"
1313
"os"
1414
"runtime"
15+
"strings"
1516

1617
ioaux "github.com/jig/teereadcloser"
1718
"github.com/kballard/go-shellquote"
@@ -371,18 +372,19 @@ func (r *request) curlCmd() (string, error) {
371372
return "", err
372373
}
373374

374-
s := "curl \\\n"
375+
var s strings.Builder
376+
s.WriteString("curl \\\n")
375377
if r.client.opts.AccessToken != "" {
376-
s += fmt.Sprintf(" %s \\\n", shellquote.Join("-H", "Authorization: token "+r.client.opts.AccessToken))
378+
s.WriteString(fmt.Sprintf(" %s \\\n", shellquote.Join("-H", "Authorization: token "+r.client.opts.AccessToken)))
377379
}
378380
// Preserve overrides if Content-Type is set
379381
if r.client.opts.AdditionalHeaders["Content-Type"] == "" {
380382
r.client.opts.AdditionalHeaders["Content-Type"] = "application/json"
381383
}
382384
for k, v := range r.client.opts.AdditionalHeaders {
383-
s += fmt.Sprintf(" %s \\\n", shellquote.Join("-H", k+": "+v))
385+
s.WriteString(fmt.Sprintf(" %s \\\n", shellquote.Join("-H", k+": "+v)))
384386
}
385-
s += fmt.Sprintf(" %s \\\n", shellquote.Join("-d", string(data)))
386-
s += fmt.Sprintf(" %s", shellquote.Join(r.client.opts.EndpointURL.JoinPath(".api/graphql").String()))
387-
return s, nil
387+
s.WriteString(fmt.Sprintf(" %s \\\n", shellquote.Join("-d", string(data))))
388+
s.WriteString(fmt.Sprintf(" %s", shellquote.Join(r.client.opts.EndpointURL.JoinPath(".api/graphql").String())))
389+
return s.String(), nil
388390
}

‎internal/api/proxy_test.go‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -266,10 +266,10 @@ func TestBuildTransport_WithProxyURL(t *testing.T) {
266266
insecure := true
267267
flags := &Flags{
268268
insecureSkipVerify: &insecure,
269-
dump: boolPtr(false),
270-
getCurl: boolPtr(false),
271-
trace: boolPtr(false),
272-
userAgentTelemetry: boolPtr(false),
269+
dump: new(false),
270+
getCurl: new(false),
271+
trace: new(false),
272+
userAgentTelemetry: new(false),
273273
}
274274
opts := ClientOpts{
275275
ProxyURL: proxyURL,
@@ -296,10 +296,10 @@ func TestBuildTransport_WithProxyPath(t *testing.T) {
296296
insecure := true
297297
flags := &Flags{
298298
insecureSkipVerify: &insecure,
299-
dump: boolPtr(false),
300-
getCurl: boolPtr(false),
301-
trace: boolPtr(false),
302-
userAgentTelemetry: boolPtr(false),
299+
dump: new(false),
300+
getCurl: new(false),
301+
trace: new(false),
302+
userAgentTelemetry: new(false),
303303
}
304304
opts := ClientOpts{
305305
ProxyPath: socketPath,
@@ -324,10 +324,10 @@ func TestBuildTransport_NoProxyPreservesProxyFunc(t *testing.T) {
324324
insecure := true
325325
flags := &Flags{
326326
insecureSkipVerify: &insecure,
327-
dump: boolPtr(false),
328-
getCurl: boolPtr(false),
329-
trace: boolPtr(false),
330-
userAgentTelemetry: boolPtr(false),
327+
dump: new(false),
328+
getCurl: new(false),
329+
trace: new(false),
330+
userAgentTelemetry: new(false),
331331
}
332332
opts := ClientOpts{} // no ProxyURL or ProxyPath
333333

@@ -353,10 +353,10 @@ func TestBuildTransport_NOPROXYOverridesHTTPSPROXY(t *testing.T) {
353353
insecure := true
354354
flags := &Flags{
355355
insecureSkipVerify: &insecure,
356-
dump: boolPtr(false),
357-
getCurl: boolPtr(false),
358-
trace: boolPtr(false),
359-
userAgentTelemetry: boolPtr(false),
356+
dump: new(false),
357+
getCurl: new(false),
358+
trace: new(false),
359+
userAgentTelemetry: new(false),
360360
}
361361
opts := ClientOpts{} // no ProxyURL or ProxyPath
362362

@@ -386,10 +386,10 @@ func TestBuildTransport_ExplicitProxyURLOverridesNOPROXY(t *testing.T) {
386386
insecure := true
387387
flags := &Flags{
388388
insecureSkipVerify: &insecure,
389-
dump: boolPtr(false),
390-
getCurl: boolPtr(false),
391-
trace: boolPtr(false),
392-
userAgentTelemetry: boolPtr(false),
389+
dump: new(false),
390+
getCurl: new(false),
391+
trace: new(false),
392+
userAgentTelemetry: new(false),
393393
}
394394
opts := ClientOpts{
395395
ProxyURL: proxyURL,
@@ -404,4 +404,5 @@ func TestBuildTransport_ExplicitProxyURLOverridesNOPROXY(t *testing.T) {
404404
}
405405
}
406406

407-
func boolPtr(b bool) *bool { return &b }
407+
//go:fix inline
408+
func boolPtr(b bool) *bool { return new(b) }

‎internal/api/test_unix_socket_server.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,7 @@ func StartUnixSocketServer(socketPath string) (*Server, error) {
5757
StopChan: make(chan struct{}),
5858
}
5959

60-
server.Wg.Add(1)
61-
go func() {
62-
defer server.Wg.Done()
60+
server.Wg.Go(func() {
6361
for {
6462
conn, err := server.Listener.Accept()
6563
if err != nil {
@@ -96,7 +94,7 @@ func StartUnixSocketServer(socketPath string) (*Server, error) {
9694
}
9795
}(conn)
9896
}
99-
}()
97+
})
10098

10199
return server, nil
102100
}

‎internal/batches/service/service.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -337,9 +337,7 @@ func (svc *Service) EnsureDockerImages(
337337
}
338338
var wg sync.WaitGroup
339339
for i := 0; i < parallelism; i++ {
340-
wg.Add(1)
341-
go func() {
342-
defer wg.Done()
340+
wg.Go(func() {
343341
for {
344342
select {
345343
case <-workerCtx.Done():
@@ -363,7 +361,7 @@ func (svc *Service) EnsureDockerImages(
363361
}
364362
}
365363
}
366-
}()
364+
})
367365
}
368366

369367
go func() {

‎internal/streaming/client.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,13 @@ func (rr Decoder) ReadAll(r io.Reader) error {
5959
// event: $event\n
6060
// data: json($data)\n\n
6161
data := scanner.Bytes()
62-
nl := bytes.Index(data, []byte("\n"))
63-
if nl < 0 {
62+
before, after, ok := bytes.Cut(data, []byte("\n"))
63+
if !ok {
6464
return fmt.Errorf("malformed event, no newline: %s", data)
6565
}
6666

67-
eventK, event := splitColon(data[:nl])
68-
dataK, data := splitColon(data[nl+1:])
67+
eventK, event := splitColon(before)
68+
dataK, data := splitColon(after)
6969

7070
if !bytes.Equal(eventK, []byte("event")) {
7171
return fmt.Errorf("malformed event, expected event: %s", eventK)
@@ -137,11 +137,11 @@ func (rr Decoder) ReadAll(r io.Reader) error {
137137
}
138138

139139
func splitColon(data []byte) ([]byte, []byte) {
140-
i := bytes.Index(data, []byte(":"))
141-
if i < 0 {
140+
before, after, ok := bytes.Cut(data, []byte(":"))
141+
if !ok {
142142
return bytes.TrimSpace(data), nil
143143
}
144-
return bytes.TrimSpace(data[:i]), bytes.TrimSpace(data[i+1:])
144+
return bytes.TrimSpace(before), bytes.TrimSpace(after)
145145
}
146146

147147
type eventMatchUnmarshaller struct {

0 commit comments

Comments
 (0)