deps: update to go-set/v3 and refactor to use custom iterators (#23971)

* deps: update to go-set/v3

* deps: use custom set iterators for looping
This commit is contained in:
Seth Hoenig
2024-09-16 13:40:10 -05:00
committed by GitHub
parent 212a72b203
commit 51215bf102
66 changed files with 108 additions and 113 deletions

View File

@@ -1,12 +1,10 @@
module github.com/hashicorp/nomad/tools
go 1.21
toolchain go1.21.0
go 1.23
require (
github.com/hashicorp/go-set/v2 v2.1.0
github.com/shoenig/test v0.6.7
github.com/hashicorp/go-set/v3 v3.0.0-alpha.1
github.com/shoenig/test v1.8.2
)
require github.com/google/go-cmp v0.5.9 // indirect
require github.com/google/go-cmp v0.6.0 // indirect

View File

@@ -1,6 +1,6 @@
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/hashicorp/go-set/v2 v2.1.0 h1:iERPCQWks+I+4bTgy0CT2myZsCqNgBg79ZHqwniohXo=
github.com/hashicorp/go-set/v2 v2.1.0/go.mod h1:6q4nh8UCVZODn2tJ5RbJi8+ki7pjZBsAEYGt6yaGeTo=
github.com/shoenig/test v0.6.7 h1:k92ohN9VyRfZn0ezNfwamtIBT/5byyfLVktRmL/Jmek=
github.com/shoenig/test v0.6.7/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/hashicorp/go-set/v3 v3.0.0-alpha.1 h1:dPUtuqKJGgxtF7YO42oE+NdUONXi5nfLMKH2NpBffIM=
github.com/hashicorp/go-set/v3 v3.0.0-alpha.1/go.mod h1:7bJRgsF3EL3AtRTzcKXdjAFbYGSef+1gHXhglGGO52k=
github.com/shoenig/test v1.8.2 h1:WDlty8UBqJRdmgdJX8lMwvCq97tiN7Um/GZD2vBDuug=
github.com/shoenig/test v1.8.2/go.mod h1:UxJ6u/x2v/TNs/LoLxBNJRV9DiwBBKYxXSyczsBHFoI=

View File

@@ -4,6 +4,7 @@
package main
import (
"cmp"
"encoding/json"
"errors"
"fmt"
@@ -14,7 +15,7 @@ import (
"sort"
"strings"
"github.com/hashicorp/go-set/v2"
"github.com/hashicorp/go-set/v3"
)
func main() {
@@ -177,7 +178,7 @@ func skip(p string) bool {
}
func inCode(root string) ([]string, error) {
pkgs := set.NewTreeSet[string](set.Compare[string])
pkgs := set.NewTreeSet(cmp.Compare[string])
err := filepath.Walk(root, func(path string, info fs.FileInfo, err error) error {
if info.IsDir() {