From e23b75cd3f35eea408777cca1ef2e5e6aa77ea22 Mon Sep 17 00:00:00 2001 From: Oleksandr Redko Date: Tue, 31 Mar 2026 16:40:06 +0300 Subject: [PATCH] internal: remove unused util functions (#871) The functions util.Sorted and util.KeySlice are unused. --- internal/util/errors.go | 16 +++++++++++++++ internal/util/util.go | 44 ----------------------------------------- 2 files changed, 16 insertions(+), 44 deletions(-) create mode 100644 internal/util/errors.go delete mode 100644 internal/util/util.go diff --git a/internal/util/errors.go b/internal/util/errors.go new file mode 100644 index 0000000..ebeb614 --- /dev/null +++ b/internal/util/errors.go @@ -0,0 +1,16 @@ +// Copyright 2025 The Go MCP SDK Authors. All rights reserved. +// Use of this source code is governed by an MIT-style +// license that can be found in the LICENSE file. + +package util + +import ( + "fmt" +) + +// Wrapf wraps *errp with the given formatted message if *errp is not nil. +func Wrapf(errp *error, format string, args ...any) { + if *errp != nil { + *errp = fmt.Errorf("%s: %w", fmt.Sprintf(format, args...), *errp) + } +} diff --git a/internal/util/util.go b/internal/util/util.go deleted file mode 100644 index 4b5c325..0000000 --- a/internal/util/util.go +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright 2025 The Go MCP SDK Authors. All rights reserved. -// Use of this source code is governed by an MIT-style -// license that can be found in the LICENSE file. - -package util - -import ( - "cmp" - "fmt" - "iter" - "slices" -) - -// Helpers below are copied from gopls' moremaps package. - -// Sorted returns an iterator over the entries of m in key order. -func Sorted[M ~map[K]V, K cmp.Ordered, V any](m M) iter.Seq2[K, V] { - // TODO(adonovan): use maps.Sorted if proposal #68598 is accepted. - return func(yield func(K, V) bool) { - keys := KeySlice(m) - slices.Sort(keys) - for _, k := range keys { - if !yield(k, m[k]) { - break - } - } - } -} - -// KeySlice returns the keys of the map M, like slices.Collect(maps.Keys(m)). -func KeySlice[M ~map[K]V, K comparable, V any](m M) []K { - r := make([]K, 0, len(m)) - for k := range m { - r = append(r, k) - } - return r -} - -// Wrapf wraps *errp with the given formatted message if *errp is not nil. -func Wrapf(errp *error, format string, args ...any) { - if *errp != nil { - *errp = fmt.Errorf("%s: %w", fmt.Sprintf(format, args...), *errp) - } -}