From ea1fd5a413aeb19250235d499a7821c9df1e2d4e Mon Sep 17 00:00:00 2001
From: Victor Agababov <vagababov@gmail.com>
Date: Fri, 9 Oct 2020 17:22:22 -0700
Subject: [PATCH] Final sync/atomic removals (#1794)

There's one sync/atomic.Value, but value already is a wholesome
type, so no need to change that one.
---
 pool/pool_test.go | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/pool/pool_test.go b/pool/pool_test.go
index e2db68561..dc274463e 100644
--- a/pool/pool_test.go
+++ b/pool/pool_test.go
@@ -20,9 +20,10 @@ import (
 	"context"
 	"errors"
 	"sync"
-	"sync/atomic"
 	"testing"
 	"time"
+
+	"go.uber.org/atomic"
 )
 
 func TestParallelismNoErrors(t *testing.T) {
@@ -50,7 +51,7 @@ func TestParallelismNoErrors(t *testing.T) {
 				// m guards max.
 				m      sync.Mutex
 				max    int32
-				active int32
+				active atomic.Int32
 			)
 
 			// Use our own waitgroup to ensure that the work
@@ -60,14 +61,14 @@ func TestParallelismNoErrors(t *testing.T) {
 
 			worker := func() error {
 				defer wg.Done()
-				na := atomic.AddInt32(&active, 1)
-				defer atomic.AddInt32(&active, -1)
+				active.Inc()
+				defer active.Dec()
 
 				func() {
 					m.Lock()
 					defer m.Unlock()
-					if max < na {
-						max = na
+					if v := active.Load(); max < v {
+						max = v
 					}
 				}()
 
@@ -129,7 +130,7 @@ func TestParallelismWithErrors(t *testing.T) {
 				// m guards max.
 				m      sync.Mutex
 				max    int32
-				active int32
+				active atomic.Int32
 			)
 
 			// Use our own waitgroup to ensure that the work
@@ -145,14 +146,14 @@ func TestParallelismWithErrors(t *testing.T) {
 			workerFactory := func(err error) func() error {
 				return func() error {
 					defer wg.Done()
-					na := atomic.AddInt32(&active, 1)
-					defer atomic.AddInt32(&active, -1)
+					active.Inc()
+					defer active.Dec()
 
 					func() {
 						m.Lock()
 						defer m.Unlock()
-						if max < na {
-							max = na
+						if v := active.Load(); max < v {
+							max = v
 						}
 					}()