Update go 1.23 (#74)

Author: sunshineplan

cache/cache.go

@@ -124,8 +124,8 @@ func (c *Cache[Key, Value]) Swap(key Key, value Value) (previous Value, loaded b
 	return
 }
 
-// Empty deletes all values in cache.
-func (c *Cache[Key, Value]) Empty() {
+// Clear deletes all values in cache.
+func (c *Cache[Key, Value]) Clear() {
 	c.m.Range(func(k Key, i *item[Value]) bool {
 		c.m.Delete(k)
 		i.Lock()

cache/cache_test.go

@@ -39,7 +39,7 @@ func TestEmpty(t *testing.T) {
 			t.Error("expected ok; got not")
 		}
 	}
-	cache.Empty()
+	cache.Clear()
 	for _, i := range []string{"a", "b", "c"} {
 		if _, ok := cache.Get(i); ok {
 			t.Error("expected not ok; got ok")
@@ -49,7 +49,7 @@ func TestEmpty(t *testing.T) {
 
 func TestRenew(t *testing.T) {
 	cache := New[string, string](true)
-	defer cache.Empty()
+	defer cache.Clear()
 	expire := make(chan struct{})
 	cache.Set("renew", "old", 2*time.Second, func() (string, error) {
 		defer func() { close(expire) }()

cache/map.go

@@ -26,13 +26,22 @@ func (m *Map[Key, Value]) Store(key Key, value Value) {
 	m.m.Store(key, value)
 }
 
+// Clear deletes all the entries, resulting in an empty Map.
+func (m *Map[Key, Value]) Clear() {
+	m.m.Clear()
+}
+
 // LoadOrStore returns the existing value for the key if present.
 // Otherwise, it stores and returns the given value.
 // The loaded result is true if the value was loaded, false if stored.
 func (m *Map[Key, Value]) LoadOrStore(key Key, value Value) (actual Value, loaded bool) {
 	var v any
-	if v, loaded = m.m.LoadOrStore(key, value); v != nil {
-		actual = v.(Value)
+	if v, loaded = m.m.LoadOrStore(key, value); loaded {
+		if v != nil {
+			actual = v.(Value)
+		}
+	} else {
+		actual = value
 	}
 	return
 }
@@ -92,10 +101,10 @@ func (m *Map[Key, Value]) CompareAndDelete(key Key, old Value) (deleted bool) {
 func (m *Map[Key, Value]) Range(f func(Key, Value) bool) {
 	m.m.Range(func(key, value any) bool {
 		var k Key
+		var v Value
 		if key != nil {
 			k = key.(Key)
 		}
-		var v Value
 		if value != nil {
 			v = value.(Value)
 		}