aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.md2
-rw-r--r--external_test.go2
-rw-r--r--funcs.go6
-rw-r--r--stm_test.go8
-rw-r--r--stmutil/containers.go54
-rw-r--r--tx.go4
-rw-r--r--var-value.go12
-rw-r--r--var.go4
8 files changed, 46 insertions, 46 deletions
diff --git a/README.md b/README.md
index ba770d9..07e9952 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ See [cmd/santa-example/main.go](cmd/santa-example/main.go) for a more complex ex
## Pointers
-Note that `Operation` now returns a value of type `interface{}`, which isn't included in the
+Note that `Operation` now returns a value of type `any`, which isn't included in the
examples throughout the documentation yet. See the type signatures for `Atomically` and `Operation`.
Be very careful when managing pointers inside transactions! (This includes
diff --git a/external_test.go b/external_test.go
index a56aeee..abdf544 100644
--- a/external_test.go
+++ b/external_test.go
@@ -132,7 +132,7 @@ func BenchmarkInvertedThunderingHerd(b *testing.B) {
for stm.Atomically(func(tx *stm.Tx) bool {
tx.Assert(tokens.Get(tx) > 0)
tokens.Set(tx, tokens.Get(tx)-1)
- pending.Get(tx).Range(func(i interface{}) bool {
+ pending.Get(tx).Range(func(i any) bool {
ready := i.(*stm.Var[bool])
if !ready.Get(tx) {
ready.Set(tx, true)
diff --git a/funcs.go b/funcs.go
index c3a597b..07d35ec 100644
--- a/funcs.go
+++ b/funcs.go
@@ -8,11 +8,11 @@ import (
)
var (
- txPool = sync.Pool{New: func() interface{} {
+ txPool = sync.Pool{New: func() any {
expvars.Add("new txs", 1)
tx := &Tx{
reads: make(map[txVar]VarValue),
- writes: make(map[txVar]interface{}),
+ writes: make(map[txVar]any),
watching: make(map[txVar]struct{}),
}
tx.cond.L = &tx.mu
@@ -138,7 +138,7 @@ func Select[R any](fns ...Operation[R]) Operation[R] {
return fns[0](tx)
default:
oldWrites := tx.writes
- tx.writes = make(map[txVar]interface{}, len(oldWrites))
+ tx.writes = make(map[txVar]any, len(oldWrites))
for k, v := range oldWrites {
tx.writes[k] = v
}
diff --git a/stm_test.go b/stm_test.go
index 8726d40..5ed1b70 100644
--- a/stm_test.go
+++ b/stm_test.go
@@ -170,7 +170,7 @@ func TestCompose(t *testing.T) {
func TestPanic(t *testing.T) {
// normal panics should escape Atomically
assert.PanicsWithValue(t, "foo", func() {
- Atomically(func(*Tx) interface{} {
+ Atomically(func(*Tx) any {
panic("foo")
})
})
@@ -213,7 +213,7 @@ func testPingPong(t testing.TB, n int, afterHit func(string)) {
var wg sync.WaitGroup
bat := func(from, to bool, noise string) {
defer wg.Done()
- for !Atomically(func(tx *Tx) interface{} {
+ for !Atomically(func(tx *Tx) any {
if doneVar.Get(tx) {
return true
}
@@ -246,7 +246,7 @@ func TestPingPong(t *testing.T) {
func TestSleepingBeauty(t *testing.T) {
require.Panics(t, func() {
- Atomically(func(tx *Tx) interface{} {
+ Atomically(func(tx *Tx) any {
tx.Assert(false)
return nil
})
@@ -262,7 +262,7 @@ func TestSleepingBeauty(t *testing.T) {
// i++
// }
// }()
-// Atomically(func(tx *Tx) interface{} {
+// Atomically(func(tx *Tx) any {
// debug.PrintStack()
// ret := func() {
// defer Atomically(nil)
diff --git a/stmutil/containers.go b/stmutil/containers.go
index e0b532d..c7a4a49 100644
--- a/stmutil/containers.go
+++ b/stmutil/containers.go
@@ -9,10 +9,10 @@ import (
)
type Settish interface {
- Add(interface{}) Settish
- Delete(interface{}) Settish
- Contains(interface{}) bool
- Range(func(interface{}) bool)
+ Add(any) Settish
+ Delete(any) Settish
+ Contains(any) bool
+ Range(func(any) bool)
iter.Iterable
Len() int
}
@@ -23,11 +23,11 @@ type mapToSet struct {
type interhash struct{}
-func (interhash) Hash(x interface{}) uint32 {
+func (interhash) Hash(x any) uint32 {
return uint32(nilinterhash(unsafe.Pointer(&x), 0))
}
-func (interhash) Equal(i, j interface{}) bool {
+func (interhash) Equal(i, j any) bool {
return i == j
}
@@ -39,12 +39,12 @@ func NewSortedSet(lesser lessFunc) Settish {
return mapToSet{NewSortedMap(lesser)}
}
-func (s mapToSet) Add(x interface{}) Settish {
+func (s mapToSet) Add(x any) Settish {
s.m = s.m.Set(x, nil)
return s
}
-func (s mapToSet) Delete(x interface{}) Settish {
+func (s mapToSet) Delete(x any) Settish {
s.m = s.m.Delete(x)
return s
}
@@ -53,13 +53,13 @@ func (s mapToSet) Len() int {
return s.m.Len()
}
-func (s mapToSet) Contains(x interface{}) bool {
+func (s mapToSet) Contains(x any) bool {
_, ok := s.m.Get(x)
return ok
}
-func (s mapToSet) Range(f func(interface{}) bool) {
- s.m.Range(func(k, _ interface{}) bool {
+func (s mapToSet) Range(f func(any) bool) {
+ s.m.Range(func(k, _ any) bool {
return f(k)
})
}
@@ -78,17 +78,17 @@ func NewMap() Mappish {
var _ Mappish = Map{}
-func (m Map) Delete(x interface{}) Mappish {
+func (m Map) Delete(x any) Mappish {
m.Map = m.Map.Delete(x)
return m
}
-func (m Map) Set(key, value interface{}) Mappish {
+func (m Map) Set(key, value any) Mappish {
m.Map = m.Map.Set(key, value)
return m
}
-func (sm Map) Range(f func(key, value interface{}) bool) {
+func (sm Map) Range(f func(key, value any) bool) {
iter := sm.Map.Iterator()
for !iter.Done() {
if !f(iter.Next()) {
@@ -98,7 +98,7 @@ func (sm Map) Range(f func(key, value interface{}) bool) {
}
func (sm Map) Iter(cb iter.Callback) {
- sm.Range(func(key, _ interface{}) bool {
+ sm.Range(func(key, _ any) bool {
return cb(key)
})
}
@@ -107,17 +107,17 @@ type SortedMap struct {
*immutable.SortedMap
}
-func (sm SortedMap) Set(key, value interface{}) Mappish {
+func (sm SortedMap) Set(key, value any) Mappish {
sm.SortedMap = sm.SortedMap.Set(key, value)
return sm
}
-func (sm SortedMap) Delete(key interface{}) Mappish {
+func (sm SortedMap) Delete(key any) Mappish {
sm.SortedMap = sm.SortedMap.Delete(key)
return sm
}
-func (sm SortedMap) Range(f func(key, value interface{}) bool) {
+func (sm SortedMap) Range(f func(key, value any) bool) {
iter := sm.SortedMap.Iterator()
for !iter.Done() {
if !f(iter.Next()) {
@@ -127,18 +127,18 @@ func (sm SortedMap) Range(f func(key, value interface{}) bool) {
}
func (sm SortedMap) Iter(cb iter.Callback) {
- sm.Range(func(key, _ interface{}) bool {
+ sm.Range(func(key, _ any) bool {
return cb(key)
})
}
-type lessFunc func(l, r interface{}) bool
+type lessFunc func(l, r any) bool
type comparer struct {
less lessFunc
}
-func (me comparer) Compare(i, j interface{}) int {
+func (me comparer) Compare(i, j any) int {
if me.less(i, j) {
return -1
} else if me.less(j, i) {
@@ -155,15 +155,15 @@ func NewSortedMap(less lessFunc) Mappish {
}
type Mappish interface {
- Set(key, value interface{}) Mappish
- Delete(key interface{}) Mappish
- Get(key interface{}) (interface{}, bool)
- Range(func(_, _ interface{}) bool)
+ Set(key, value any) Mappish
+ Delete(key any) Mappish
+ Get(key any) (any, bool)
+ Range(func(_, _ any) bool)
Len() int
iter.Iterable
}
-func GetLeft(l, _ interface{}) interface{} {
+func GetLeft(l, _ any) any {
return l
}
@@ -171,7 +171,7 @@ func GetLeft(l, _ interface{}) interface{} {
//go:linkname nilinterhash runtime.nilinterhash
func nilinterhash(p unsafe.Pointer, h uintptr) uintptr
-func interfaceHash(x interface{}) uint32 {
+func interfaceHash(x any) uint32 {
return uint32(nilinterhash(unsafe.Pointer(&x), 0))
}
diff --git a/tx.go b/tx.go
index 4542e61..825ff01 100644
--- a/tx.go
+++ b/tx.go
@@ -11,7 +11,7 @@ import (
type txVar interface {
getValue() *atomic.Value[VarValue]
- changeValue(interface{})
+ changeValue(any)
getWatchers() *sync.Map
getLock() *sync.Mutex
}
@@ -19,7 +19,7 @@ type txVar interface {
// A Tx represents an atomic transaction.
type Tx struct {
reads map[txVar]VarValue
- writes map[txVar]interface{}
+ writes map[txVar]any
watching map[txVar]struct{}
locks txLocks
mu sync.Mutex
diff --git a/var-value.go b/var-value.go
index f4921f3..3518bf6 100644
--- a/var-value.go
+++ b/var-value.go
@@ -1,8 +1,8 @@
package stm
type VarValue interface {
- Set(interface{}) VarValue
- Get() interface{}
+ Set(any) VarValue
+ Get() any
Changed(VarValue) bool
}
@@ -13,14 +13,14 @@ type versionedValue[T any] struct {
version version
}
-func (me versionedValue[T]) Set(newValue interface{}) VarValue {
+func (me versionedValue[T]) Set(newValue any) VarValue {
return versionedValue[T]{
value: newValue.(T),
version: me.version + 1,
}
}
-func (me versionedValue[T]) Get() interface{} {
+func (me versionedValue[T]) Get() any {
return me.value
}
@@ -39,13 +39,13 @@ func (me customVarValue[T]) Changed(other VarValue) bool {
return me.changed(me.value, other.(customVarValue[T]).value)
}
-func (me customVarValue[T]) Set(newValue interface{}) VarValue {
+func (me customVarValue[T]) Set(newValue any) VarValue {
return customVarValue[T]{
value: newValue.(T),
changed: me.changed,
}
}
-func (me customVarValue[T]) Get() interface{} {
+func (me customVarValue[T]) Get() any {
return me.value
}
diff --git a/var.go b/var.go
index 2354d96..ec6a81e 100644
--- a/var.go
+++ b/var.go
@@ -25,7 +25,7 @@ func (v *Var[T]) getLock() *sync.Mutex {
return &v.mu
}
-func (v *Var[T]) changeValue(new interface{}) {
+func (v *Var[T]) changeValue(new any) {
old := v.value.Load()
newVarValue := old.Set(new)
v.value.Store(newVarValue)
@@ -35,7 +35,7 @@ func (v *Var[T]) changeValue(new interface{}) {
}
func (v *Var[T]) wakeWatchers(new VarValue) {
- v.watchers.Range(func(k, _ interface{}) bool {
+ v.watchers.Range(func(k, _ any) bool {
tx := k.(*Tx)
// We have to lock here to ensure that the Tx is waiting before we signal it. Otherwise we
// could signal it before it goes to sleep and it will miss the notification.
generated by cgit v1.2.3 (git 2.49.0) at 2025-07-13 04:55:32 +0000