From 7ce83e7fd09e73f95b59b40be936c0994803b24a Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 14 Mar 2023 22:40:20 +0530 Subject: [PATCH] Use the generic contains/index from slices instead of our custom one --- tools/cmd/clipboard/read.go | 6 ++++-- tools/utils/misc.go | 13 ------------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/tools/cmd/clipboard/read.go b/tools/cmd/clipboard/read.go index 664e7ab02..86448906f 100644 --- a/tools/cmd/clipboard/read.go +++ b/tools/cmd/clipboard/read.go @@ -16,6 +16,8 @@ import ( "kitty/tools/tui/loop" "kitty/tools/utils" "kitty/tools/utils/images" + + "golang.org/x/exp/slices" ) var _ = fmt.Print @@ -144,13 +146,13 @@ func (self *Output) assign_mime_type(available_mimes []string, aliases map[strin self.remote_mime_type = "." return } - if utils.Contains(available_mimes, self.mime_type) { + if slices.Contains(available_mimes, self.mime_type) { self.remote_mime_type = self.mime_type return } if len(aliases[self.mime_type]) > 0 { for _, alias := range aliases[self.mime_type] { - if utils.Contains(available_mimes, alias) { + if slices.Contains(available_mimes, alias) { self.remote_mime_type = alias return } diff --git a/tools/utils/misc.go b/tools/utils/misc.go index 760422de3..89c227f9a 100644 --- a/tools/utils/misc.go +++ b/tools/utils/misc.go @@ -120,19 +120,6 @@ func Min[T constraints.Ordered](a T, items ...T) (ans T) { return ans } -func Index[T comparable](haystack []T, needle T) int { - for i, x := range haystack { - if x == needle { - return i - } - } - return -1 -} - -func Contains[T comparable](haystack []T, needle T) bool { - return Index(haystack, needle) > -1 -} - // Keys returns the keys of the map m. // The keys will be an indeterminate order. func Keys[M ~map[K]V, K comparable, V any](m M) []K {