avoid apis added in go 1.19

evanw · Jan 16, 2023 · 19cc14d · 19cc14d
1 parent 232f4b9
commit 19cc14d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/internal/config/config.go b/internal/config/config.go
@@ -243,12 +243,16 @@ const (
 )
 
 type CancelFlag struct {
-	atomic.Bool
+	uint32
+}
+
+func (flag *CancelFlag) Cancel() {
+	atomic.StoreUint32(&flag.uint32, 1)
 }
 
 // This checks for nil in one place so we don't have to do that everywhere
 func (flag *CancelFlag) DidCancel() bool {
-	return flag != nil && flag.Load()
+	return flag != nil && atomic.LoadUint32(&flag.uint32) != 0
 }
 
 type Options struct {

diff --git a/pkg/api/api_impl.go b/pkg/api/api_impl.go
@@ -1082,7 +1082,7 @@ func (ctx *internalContext) Cancel() {
 
 	if build != nil {
 		// Tell observers to cut this build short
-		build.cancel.Store(true)
+		build.cancel.Cancel()
 
 		// Wait for the build to finish before returning
 		build.waitGroup.Wait()