From 2899885c4220560df4f60e4c052a6ab9773a0386 Mon Sep 17 00:00:00 2001 From: Kyle Isom Date: Sat, 15 Nov 2025 22:46:42 -0800 Subject: [PATCH] linter fixes --- go.mod | 2 +- mru.go | 12 ++++++------ mru_test.go => mru_internal_test.go | 0 timestamps.go | 13 +++++++------ timestamps_test.go => timestamps_internal_test.go | 1 - 5 files changed, 14 insertions(+), 14 deletions(-) rename mru_test.go => mru_internal_test.go (100%) rename timestamps_test.go => timestamps_internal_test.go (99%) diff --git a/go.mod b/go.mod index 8e8e9ef..fcd2735 100644 --- a/go.mod +++ b/go.mod @@ -1,5 +1,5 @@ module git.wntrmute.dev/kyle/go-mru -go 1.17 +go 1.22 require github.com/benbjohnson/clock v1.3.5 diff --git a/mru.go b/mru.go index b0826b8..cd42f05 100644 --- a/mru.go +++ b/mru.go @@ -10,7 +10,7 @@ import ( ) type item struct { - V interface{} + V any access int64 } @@ -28,11 +28,11 @@ type Cache struct { } // New must be used to create a new Cache. -func New(cap int) *Cache { +func New(icap int) *Cache { return &Cache{ store: map[string]*item{}, - access: newTimestamps(cap), - cap: cap, + access: newTimestamps(icap), + cap: icap, clock: clock.New(), mtx: &sync.Mutex{}, } @@ -114,7 +114,7 @@ func (c *Cache) ConsistencyCheck() error { } // Store adds the value v to the cache under the k. -func (c *Cache) Store(k string, v interface{}) { +func (c *Cache) Store(k string, v any) { c.lock() defer c.unlock() @@ -139,7 +139,7 @@ func (c *Cache) Store(k string, v interface{}) { // Get returns the value stored in the cache. If the item isn't present, // it will return false. -func (c *Cache) Get(k string) (interface{}, bool) { +func (c *Cache) Get(k string) (any, bool) { c.lock() defer c.unlock() diff --git a/mru_test.go b/mru_internal_test.go similarity index 100% rename from mru_test.go rename to mru_internal_test.go diff --git a/timestamps.go b/timestamps.go index 37881ff..6cd5a27 100644 --- a/timestamps.go +++ b/timestamps.go @@ -3,6 +3,7 @@ package mru import ( "errors" "fmt" + "io" "sort" ) @@ -19,10 +20,10 @@ type timestamps struct { cap int } -func newTimestamps(cap int) *timestamps { +func newTimestamps(icap int) *timestamps { return ×tamps{ - ts: make([]timestamp, 0, cap), - cap: cap, + ts: make([]timestamp, 0, icap), + cap: icap, } } @@ -47,7 +48,7 @@ func (ts *timestamps) Swap(i, j int) { } func (ts *timestamps) Find(k string) (int, bool) { - for i := 0; i < len(ts.ts); i++ { + for i := range len(ts.ts) { if ts.ts[i].k == k { return i, true } @@ -93,8 +94,8 @@ func (ts *timestamps) Delete(i int) { ts.ts = append(ts.ts[:i], ts.ts[i+1:]...) } -func (ts *timestamps) Dump() { +func (ts *timestamps) Dump(w io.Writer) { for i := range ts.ts { - fmt.Printf("%d: %s, %d\n", i, ts.K(i), ts.T(i)) + fmt.Fprintf(w, "%d: %s, %d\n", i, ts.K(i), ts.T(i)) } } diff --git a/timestamps_test.go b/timestamps_internal_test.go similarity index 99% rename from timestamps_test.go rename to timestamps_internal_test.go index 13e3bbf..fb7afee 100644 --- a/timestamps_test.go +++ b/timestamps_internal_test.go @@ -46,5 +46,4 @@ func TestTimestamps(t *testing.T) { if ts.K(2) != "owl" { t.Fatalf("third key should be owl, have %s", ts.K(2)) } - }