aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHana Kim <hyangah@gmail.com>2026-03-05 22:50:35 -0500
committerHyang-Ah Hana Kim <hyangah@gmail.com>2026-03-27 14:16:08 -0700
commit6ce2f68b79f236c20f1dce90d794effe6b4ad6bd (patch)
treeb153b0b984a24e7507711eff8d636e7d3b9cd542
parent58080fe0c6f1298a7578f6a9a29bf97362aabe68 (diff)
downloadgo-x-pkgsite-6ce2f68b79f236c20f1dce90d794effe6b4ad6bd.tar.xz
all: run go fix -waitgroup
Change-Id: Iefc4a999101eb1fc5ea2ccd2dc6981f1967c7222 Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/753435 kokoro-CI: kokoro <noreply+kokoro@google.com> Reviewed-by: Jonathan Amsterdam <jba@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
-rw-r--r--internal/frontend/search.go6
-rw-r--r--internal/symbol/generate.go6
-rw-r--r--internal/worker/fetch.go18
3 files changed, 10 insertions, 20 deletions
diff --git a/internal/frontend/search.go b/internal/frontend/search.go
index 0dac8417..842d505a 100644
--- a/internal/frontend/search.go
+++ b/internal/frontend/search.go
@@ -580,11 +580,9 @@ func addVulns(ctx context.Context, rs []*SearchResult, vc *vuln.Client) {
var wg sync.WaitGroup
// TODO(golang/go#48223): throttle concurrency?
for _, r := range rs {
- wg.Add(1)
- go func() {
- defer wg.Done()
+ wg.Go(func() {
r.Vulns = vuln.VulnsForPackage(ctx, r.ModulePath, r.Version, r.PackagePath, vc)
- }()
+ })
}
wg.Wait()
diff --git a/internal/symbol/generate.go b/internal/symbol/generate.go
index 3cb8f569..1fb5b600 100644
--- a/internal/symbol/generate.go
+++ b/internal/symbol/generate.go
@@ -42,11 +42,9 @@ func GenerateFeatureContexts(ctx context.Context, pkgPath, pkgDir string) (map[s
var wg sync.WaitGroup
walkers := make([]*Walker, len(internal.BuildContexts))
for i, context := range contexts {
- wg.Add(1)
- go func() {
- defer wg.Done()
+ wg.Go(func() {
walkers[i] = NewWalker(context, pkgPath, pkgDir, filepath.Join(build.Default.GOROOT, "src"))
- }()
+ })
}
wg.Wait()
var featureCtx = make(map[string]map[string]bool) // feature -> context name -> true
diff --git a/internal/worker/fetch.go b/internal/worker/fetch.go
index a063ef9a..f9b741e1 100644
--- a/internal/worker/fetch.go
+++ b/internal/worker/fetch.go
@@ -321,9 +321,7 @@ func (f *Fetcher) fetchAndInsertModule(ctx context.Context, modulePath, requeste
// target if applicable.
done := internal.RequestState(ctx, "fetching")
var wg sync.WaitGroup
- wg.Add(1)
- go func() {
- defer wg.Done()
+ wg.Go(func() {
start := time.Now()
fr := fetch.FetchModule(ctx, modulePath, requestedVersion, moduleGetter)
if fr == nil {
@@ -331,24 +329,20 @@ func (f *Fetcher) fetchAndInsertModule(ctx context.Context, modulePath, requeste
}
ft.FetchResult = *fr
ft.timings["fetch.FetchModule"] = time.Since(start)
- }()
+ })
// Do not resolve the @main and @master version if proxy fetch is disabled.
var main string
- wg.Add(1)
- go func() {
- defer wg.Done()
+ wg.Go(func() {
if !f.ProxyClient.FetchDisabled() {
main = resolvedVersion(ctx, modulePath, internal.MainVersion, moduleGetter)
}
- }()
+ })
var master string
- wg.Add(1)
- go func() {
- defer wg.Done()
+ wg.Go(func() {
if !f.ProxyClient.FetchDisabled() {
master = resolvedVersion(ctx, modulePath, internal.MasterVersion, moduleGetter)
}
- }()
+ })
wg.Wait()
done()
ft.MainVersion = main