Merge branch 'lukeshu/lint'

1 files changed, 14 insertions, 24 deletions

diff --git a/lib/containers/lru.go b/lib/containers/lru.go
index a235a12..aa372ed 100644
--- a/lib/containers/lru.go
+++ b/lib/containers/lru.go
@@ -1,80 +1,70 @@
-// Copyright (C) 2022  Luke Shumaker <lukeshu@lukeshu.com>
+// Copyright (C) 2022-2023  Luke Shumaker <lukeshu@lukeshu.com>
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 package containers
 
 import (
-	"sync"
-
 	lru "github.com/hashicorp/golang-lru"
 )
 
 // LRUCache is a least-recently-used(ish) cache.  A zero LRUCache is
-// usable and has a cache size of 128 items; use NewLRUCache to set a
-// different size.
+// not usable; it must be initialized with NewLRUCache.
 type LRUCache[K comparable, V any] struct {
-	initOnce sync.Once
-	inner    *lru.ARCCache
+	inner *lru.ARCCache
 }
 
 func NewLRUCache[K comparable, V any](size int) *LRUCache[K, V] {
 	c := new(LRUCache[K, V])
-	c.initOnce.Do(func() {
-		c.inner, _ = lru.NewARC(size)
-	})
+	c.inner, _ = lru.NewARC(size)
 	return c
 }
 
-func (c *LRUCache[K, V]) init() {
-	c.initOnce.Do(func() {
-		c.inner, _ = lru.NewARC(128)
-	})
-}
-
 func (c *LRUCache[K, V]) Add(key K, value V) {
-	c.init()
 	c.inner.Add(key, value)
 }
+
 func (c *LRUCache[K, V]) Contains(key K) bool {
-	c.init()
 	return c.inner.Contains(key)
 }
+
 func (c *LRUCache[K, V]) Get(key K) (value V, ok bool) {
-	c.init()
 	_value, ok := c.inner.Get(key)
 	if ok {
+		//nolint:forcetypeassert // Typed wrapper around untyped lib.
 		value = _value.(V)
 	}
 	return value, ok
 }
+
 func (c *LRUCache[K, V]) Keys() []K {
-	c.init()
 	untyped := c.inner.Keys()
 	typed := make([]K, len(untyped))
 	for i := range untyped {
+		//nolint:forcetypeassert // Typed wrapper around untyped lib.
 		typed[i] = untyped[i].(K)
 	}
 	return typed
 }
+
 func (c *LRUCache[K, V]) Len() int {
-	c.init()
 	return c.inner.Len()
 }
+
 func (c *LRUCache[K, V]) Peek(key K) (value V, ok bool) {
-	c.init()
 	_value, ok := c.inner.Peek(key)
 	if ok {
+		//nolint:forcetypeassert // Typed wrapper around untyped lib.
 		value = _value.(V)
 	}
 	return value, ok
 }
+
 func (c *LRUCache[K, V]) Purge() {
-	c.init()
 	c.inner.Purge()
 }
+
 func (c *LRUCache[K, V]) Remove(key K) {
-	c.init()
 	c.inner.Remove(key)
 }