Skip to content

Commit 69446f1

Browse files
committed
bumped go version to 1.25.0
ran 'go fix' again. this replaces the waitgroup.Add()/Done() idiom with new waitgoup.Go() edited statviz patch file so that it can still be applied
1 parent 5fb080c commit 69446f1

File tree

4 files changed

+6
-10
lines changed

4 files changed

+6
-10
lines changed

0001-statsviz.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ index 94421d750..cc8a72055 100644
33
--- a/go.mod
44
+++ b/go.mod
55
@@ -3,6 +3,7 @@ module github.com/jetsetilly/gopher2600
6-
go 1.24.0
6+
go 1.25.0
77

88
require (
99
+ github.com/arl/statsviz v0.6.0

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/jetsetilly/gopher2600
22

3-
go 1.24.0
3+
go 1.25.0
44

55
require (
66
github.com/go-audio/audio v1.0.0

gui/sdlaudio/audio.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,11 +173,9 @@ func (aud *Audio) SetSpec(spec specification.Spec) {
173173
}
174174

175175
// start new request
176-
aud.updateSync.Add(1)
177176

178-
go func() {
177+
aud.updateSync.Go(func() {
179178
// request always signals when it's done
180-
defer aud.updateSync.Done()
181179

182180
// wait for cancel request or a timeout
183181
select {
@@ -188,7 +186,7 @@ func (aud *Audio) SetSpec(spec specification.Spec) {
188186
// audio goroutine
189187
aud.updateCommit <- spec
190188
}
191-
}()
189+
})
192190
}
193191

194192
func (aud *Audio) setSpec(spec specification.Spec) {

regression/regression.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -446,11 +446,9 @@ func RegressRun(messages io.Writer, opts RegressRunOptions) error {
446446
return nil
447447
}
448448

449-
wg.Add(1)
450-
go func() {
451-
defer wg.Done()
449+
wg.Go(func() {
452450
runTest(reg, key)
453-
}()
451+
})
454452

455453
return nil
456454
}

0 commit comments

Comments
 (0)