refactor

konoui · Jul 28, 2024 · abb8ab1 · abb8ab1
1 parent 40f7870
commit abb8ab1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/pkg/lipo/lipo.go b/pkg/lipo/lipo.go
@@ -119,7 +119,7 @@ func perm(f string) (fs.FileMode, error) {
 
 // diff return values `a` does not have
 func diff[T comparable](a []T, b []T) T {
-	m := util.ExistsMap(a, func(t T) T { return t })
+	m := util.ExistenceMap(a, func(t T) T { return t })
 	for _, v := range b {
 		if _, ok := m[v]; !ok {
 			return v

diff --git a/pkg/lipo/operation.go b/pkg/lipo/operation.go
@@ -15,7 +15,7 @@ import (
 )
 
 func extract[T lmacho.Object](objects []T, cpuStrings ...string) []T {
-	m := util.ExistsMap(cpuStrings, func(v string) string {
+	m := util.ExistenceMap(cpuStrings, func(v string) string {
 		return v
 	})
 	return util.Filter(objects, func(o T) bool {
@@ -25,7 +25,7 @@ func extract[T lmacho.Object](objects []T, cpuStrings ...string) []T {
 }
 
 func extractFamily[T lmacho.Object](objects []T, cpuStrings ...string) []T {
-	m := util.ExistsMap(cpuStrings, func(v string) lmacho.Cpu {
+	m := util.ExistenceMap(cpuStrings, func(v string) lmacho.Cpu {
 		cpu, _, _ := lmacho.ToCpu(v)
 		return cpu
 	})
@@ -36,7 +36,7 @@ func extractFamily[T lmacho.Object](objects []T, cpuStrings ...string) []T {
 }
 
 func remove[T lmacho.Object](objects []T, cpuStrings ...string) []T {
-	m := util.ExistsMap(cpuStrings, func(v string) string {
+	m := util.ExistenceMap(cpuStrings, func(v string) string {
 		return v
 	})
 	return util.Filter(objects, func(o T) bool {

diff --git a/pkg/lipo/verify_arch.go b/pkg/lipo/verify_arch.go
@@ -8,7 +8,7 @@ func (l *Lipo) VerifyArch(arches ...string) (bool, error) {
 		return false, err
 	}
 
-	m := util.ExistsMap(gotArches, func(a string) string { return a })
+	m := util.ExistenceMap(gotArches, func(a string) string { return a })
 	for _, a := range arches {
 		if _, ok := m[a]; !ok {
 			return false, nil

diff --git a/pkg/util/collection.go b/pkg/util/collection.go
@@ -31,7 +31,7 @@ func Duplicates[T any, K comparable](values []T, fn func(v T) K) *K {
 	return nil
 }
 
-func ExistsMap[T comparable, K comparable](values []T, fn func(v T) K) map[K]struct{} {
+func ExistenceMap[T comparable, K comparable](values []T, fn func(v T) K) map[K]struct{} {
 	results := map[K]struct{}{}
 	for _, e := range values {
 		results[fn(e)] = struct{}{}