up(dump,arr): update some dump, arr check func logic

gookit · Apr 9, 2022 · dec75c4 · dec75c4
1 parent 5137df3
commit dec75c4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/arrutil/check.go b/arrutil/check.go
@@ -27,6 +27,9 @@ func Int64sHas(ints []int64, val int64) bool {
 	return false
 }
 
+// InStrings alias of StringsHas()
+func InStrings(elem string, ss []string) bool { return StringsHas(ss, elem) }
+
 // StringsHas check the []string contains the given element
 func StringsHas(ss []string, val string) bool {
 	for _, ele := range ss {
@@ -37,12 +40,12 @@ func StringsHas(ss []string, val string) bool {
 	return false
 }
 
-// HasValue check array(strings, intXs, uintXs) should be contains the given value(int(X),string).
+// HasValue check array(strings, intXs, uintXs) should be contained the given value(int(X),string).
 func HasValue(arr, val interface{}) bool {
 	return Contains(arr, val)
 }
 
-// Contains check array(strings, intXs, uintXs) should be contains the given value(int(X),string).
+// Contains check array(strings, intXs, uintXs) should be contained the given value(int(X),string).
 func Contains(arr, val interface{}) bool {
 	if val == nil || arr == nil {
 		return false

diff --git a/arrutil/check_test.go b/arrutil/check_test.go
@@ -25,7 +25,10 @@ func TestStringsHas(t *testing.T) {
 	ss := []string{"a", "b"}
 	assert.True(t, arrutil.StringsHas(ss, "a"))
 	assert.True(t, arrutil.StringsHas(ss, "b"))
+	assert.True(t, arrutil.InStrings("b", ss))
+
 	assert.False(t, arrutil.StringsHas(ss, "c"))
+	assert.False(t, arrutil.InStrings("c", ss))
 }
 
 func TestContains(t *testing.T) {

diff --git a/dump/dump.go b/dump/dump.go
@@ -105,11 +105,7 @@ func Fprint(w io.Writer, vs ...interface{}) {
 func Format(vs ...interface{}) string {
 	w := &bytes.Buffer{}
 
-	NewWithOptions(func(opts *Options) {
-		opts.Output = w
-		opts.ShowFlag = Fnopos
-	}).Println(vs...)
-
+	std2.Fprint(w, vs...)
 	return w.String()
 }