deps: upgrade to go-set/v2 (#18638)

No functional changes, just cleaning up deprecated usages that are
removed in v2 and replace one call of .Slice with .ForEach to avoid
making the intermediate copy.
This commit is contained in:
Seth Hoenig
2023-10-05 11:56:17 -05:00
committed by GitHub
parent 533f293fa8
commit e3c8700ded
53 changed files with 93 additions and 86 deletions

View File

@@ -1,10 +1,12 @@
module github.com/hashicorp/nomad/tools
go 1.20
go 1.21
toolchain go1.21.0
require (
github.com/hashicorp/go-set v0.1.11
github.com/shoenig/test v0.6.4
github.com/hashicorp/go-set/v2 v2.0.0-alpha.1
github.com/shoenig/test v0.6.7
)
require github.com/google/go-cmp v0.5.9 // 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 v0.1.11 h1:EZU3AzhNfCcMHtU0hCo2j4FAp7OHFDe/KTfmsbu1QIM=
github.com/hashicorp/go-set v0.1.11/go.mod h1:BaYYjrI6m7H3D0j+N5Z0rZkCbBXOgNtuoDHrMJfORsk=
github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
github.com/hashicorp/go-set/v2 v2.0.0-alpha.1 h1:vnuI6A2kou5+tcj5sF+cROU3mTeWPx2BGmsbBhBp/+E=
github.com/hashicorp/go-set/v2 v2.0.0-alpha.1/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=

View File

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