Skip to content

Commit 0f22ba9

Browse files
committed
use MarkerSet
1 parent b352e0a commit 0f22ba9

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

pkg/analysis/duplicatemarkers/analyzer.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"go/ast"
2121

2222
"golang.org/x/tools/go/analysis"
23-
"k8s.io/apimachinery/pkg/util/sets"
2423

2524
kalerrors "sigs.k8s.io/kube-api-linter/pkg/analysis/errors"
2625
"sigs.k8s.io/kube-api-linter/pkg/analysis/helpers/extractjsontags"
@@ -65,11 +64,11 @@ func checkField(pass *analysis.Pass, field *ast.Field, markersAccess markers.Mar
6564

6665
fieldMarkers := markersAccess.FieldMarkers(field)
6766

68-
set := sets.New[string]()
67+
markerSet := markers.NewMarkerSet()
6968

7069
for _, marker := range fieldMarkers.UnsortedList() {
71-
if !set.Has(marker.String()) {
72-
set.Insert(marker.String())
70+
if !markerSet.HasWithValue(marker.String()) {
71+
markerSet.Insert(marker)
7372
continue
7473
}
7574

@@ -87,11 +86,11 @@ func checkTypeSpec(pass *analysis.Pass, typeSpec *ast.TypeSpec, markersAccess ma
8786

8887
typeMarkers := markersAccess.TypeMarkers(typeSpec)
8988

90-
set := sets.New[string]()
89+
markerSet := markers.NewMarkerSet()
9190

9291
for _, marker := range typeMarkers.UnsortedList() {
93-
if !set.Has(marker.String()) {
94-
set.Insert(marker.String())
92+
if !markerSet.HasWithValue(marker.String()) {
93+
markerSet.Insert(marker)
9594
continue
9695
}
9796

0 commit comments

Comments
 (0)