From 9fb017841af920436f701f7d236db3666eb44ba3 Mon Sep 17 00:00:00 2001 From: Edward Muller Date: Thu, 27 Mar 2025 21:29:15 -0700 Subject: [PATCH 1/3] fix unused locker interface --- locked.go | 4 ++-- locked_ordered.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/locked.go b/locked.go index c0394db..40fd78b 100644 --- a/locked.go +++ b/locked.go @@ -41,8 +41,8 @@ func NewLockedWith[M comparable](m ...M) *Locked[M] { // NewLockedWrapping returns a Set[M]. If set is already a locked set, then it is just returned as is. If set isn't a locked set // then the returned set is wrapped so that it is safe for concurrent use. func NewLockedWrapping[M comparable](set Set[M]) Set[M] { - if lset, ok := set.(*Locked[M]); ok { - return lset + if _, ok := set.(locker); ok { + return set } lset := NewLocked[M]() diff --git a/locked_ordered.go b/locked_ordered.go index d3fe57d..60cbd43 100644 --- a/locked_ordered.go +++ b/locked_ordered.go @@ -43,8 +43,8 @@ func NewLockedOrderedWith[M cmp.Ordered](m ...M) *LockedOrdered[M] { // NewLockedOrderedWrapping returns an OrderedSet[M]. If set is already a locked set, then it is just returned as is. If set isn't a locked set // then the returned set is wrapped so that it is safe for concurrent use. func NewLockedOrderedWrapping[M cmp.Ordered](set OrderedSet[M]) OrderedSet[M] { - if lset, ok := set.(*LockedOrdered[M]); ok { - return lset + if _, ok := set.(locker); ok { + return set } lset := NewLockedOrdered[M]() lset.set = set From 30e7672e23818b7ed97e07fdf296ed650e90bf29 Mon Sep 17 00:00:00 2001 From: Edward Muller Date: Thu, 27 Mar 2025 21:29:37 -0700 Subject: [PATCH 2/3] fix unused variable --- map.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/map.go b/map.go index 6a4b9ce..27061e1 100644 --- a/map.go +++ b/map.go @@ -12,7 +12,7 @@ type Map[M comparable] struct { set map[M]struct{} } -var x Set[int] = new(Map[int]) +var _ Set[int] = new(Map[int]) // NewMap returns an empty Set[M] instance. func NewMap[M comparable]() *Map[M] { From 2bad1197fb82862b20c2de12e57f161303fe7fa5 Mon Sep 17 00:00:00 2001 From: Edward Muller Date: Thu, 27 Mar 2025 21:34:28 -0700 Subject: [PATCH 3/3] update changelog #patch --- CHANGELOG.MD | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.MD b/CHANGELOG.MD index b777773..1a394bb 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -1,5 +1,9 @@ # Changelog +## v0.9.1 + +* Small staticcheck fixes + ## v0.9.0 * Renames