another linter fix

Author: kokizzu

database/spanner/spanner.go

@@ -153,15 +153,15 @@ func (s *Spanner) Close() error {
 // Lock implements database.Driver but doesn't do anything because Spanner only
 // enqueues the UpdateDatabaseDdlRequest.
 func (s *Spanner) Lock() error {
-	if swapped := s.lock.CAS(unlockedVal, lockedVal); swapped {
+	if swapped := s.lock.CompareAndSwap(unlockedVal, lockedVal); swapped {
 		return nil
 	}
 	return ErrLockHeld
 }
 
 // Unlock implements database.Driver but no action required, see Lock.
 func (s *Spanner) Unlock() error {
-	if swapped := s.lock.CAS(lockedVal, unlockedVal); swapped {
+	if swapped := s.lock.CompareAndSwap(lockedVal, unlockedVal); swapped {
 		return nil
 	}
 	return ErrLockNotHeld

database/util.go

@@ -21,7 +21,7 @@ func GenerateAdvisoryLockId(databaseName string, additionalNames ...string) (str
 
 // CasRestoreOnErr CAS wrapper to automatically restore the lock state on error
 func CasRestoreOnErr(lock *atomic.Bool, o, n bool, casErr error, f func() error) error {
-	if !lock.CAS(o, n) {
+	if !lock.CompareAndSwap(o, n) {
 		return casErr
 	}
 	if err := f(); err != nil {

testing/testing.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	dockertypes "github.com/docker/docker/api/types"
+	"github.com/docker/docker/api/types/container"
 )
 
 type IsReadyFunc func(Instance) bool
@@ -98,6 +98,6 @@ type Instance interface {
 	Host() string
 	Port() uint
 	PortFor(int) uint
-	NetworkSettings() dockertypes.NetworkSettings
+	NetworkSettings() container.NetworkSettings
 	KeepForDebugging()
 }