summaryrefslogtreecommitdiff
path: root/internal/funcs/strings.go
diff options
context:
space:
mode:
Diffstat (limited to 'internal/funcs/strings.go')
-rw-r--r--internal/funcs/strings.go70
1 files changed, 35 insertions, 35 deletions
diff --git a/internal/funcs/strings.go b/internal/funcs/strings.go
index 8b27ad19..f5f7fc1d 100644
--- a/internal/funcs/strings.go
+++ b/internal/funcs/strings.go
@@ -24,11 +24,11 @@ import (
)
// CreateStringFuncs -
-func CreateStringFuncs(ctx context.Context) map[string]interface{} {
- f := map[string]interface{}{}
+func CreateStringFuncs(ctx context.Context) map[string]any {
+ f := map[string]any{}
ns := &StringFuncs{ctx, language.Und}
- f["strings"] = func() interface{} { return ns }
+ f["strings"] = func() any { return ns }
f["replaceAll"] = ns.ReplaceAll
f["title"] = ns.Title
@@ -113,7 +113,7 @@ func (f *StringFuncs) oldTrim(s, cutset string) string {
// ----
// Abbrev -
-func (StringFuncs) Abbrev(args ...interface{}) (string, error) {
+func (StringFuncs) Abbrev(args ...any) (string, error) {
str := ""
offset := 0
width := 0
@@ -154,27 +154,27 @@ func (StringFuncs) Abbrev(args ...interface{}) (string, error) {
// ReplaceAll -
//
//nolint:revive
-func (StringFuncs) ReplaceAll(old, new string, s interface{}) string {
+func (StringFuncs) ReplaceAll(old, new string, s any) string {
return strings.ReplaceAll(conv.ToString(s), old, new)
}
// Contains -
-func (StringFuncs) Contains(substr string, s interface{}) bool {
+func (StringFuncs) Contains(substr string, s any) bool {
return strings.Contains(conv.ToString(s), substr)
}
// HasPrefix -
-func (StringFuncs) HasPrefix(prefix string, s interface{}) bool {
+func (StringFuncs) HasPrefix(prefix string, s any) bool {
return strings.HasPrefix(conv.ToString(s), prefix)
}
// HasSuffix -
-func (StringFuncs) HasSuffix(suffix string, s interface{}) bool {
+func (StringFuncs) HasSuffix(suffix string, s any) bool {
return strings.HasSuffix(conv.ToString(s), suffix)
}
// Repeat -
-func (StringFuncs) Repeat(count int, s interface{}) (string, error) {
+func (StringFuncs) Repeat(count int, s any) (string, error) {
if count < 0 {
return "", fmt.Errorf("negative count %d", count)
}
@@ -193,16 +193,16 @@ func (StringFuncs) SkipLines(skip int, in string) (string, error) {
// Sort -
//
// Deprecated: use [CollFuncs.Sort] instead
-func (f *StringFuncs) Sort(list interface{}) ([]string, error) {
+func (f *StringFuncs) Sort(list any) ([]string, error) {
deprecated.WarnDeprecated(f.ctx, "strings.Sort is deprecated - use coll.Sort instead")
switch v := list.(type) {
case []string:
return gompstrings.Sort(v), nil
- case []interface{}:
+ case []any:
l := len(v)
b := make([]string, len(v))
- for i := 0; i < l; i++ {
+ for i := range l {
b[i] = conv.ToString(v[i])
}
return gompstrings.Sort(b), nil
@@ -212,67 +212,67 @@ func (f *StringFuncs) Sort(list interface{}) ([]string, error) {
}
// Split -
-func (StringFuncs) Split(sep string, s interface{}) []string {
+func (StringFuncs) Split(sep string, s any) []string {
return strings.Split(conv.ToString(s), sep)
}
// SplitN -
-func (StringFuncs) SplitN(sep string, n int, s interface{}) []string {
+func (StringFuncs) SplitN(sep string, n int, s any) []string {
return strings.SplitN(conv.ToString(s), sep, n)
}
// Trim -
-func (StringFuncs) Trim(cutset string, s interface{}) string {
+func (StringFuncs) Trim(cutset string, s any) string {
return strings.Trim(conv.ToString(s), cutset)
}
// TrimLeft -
-func (StringFuncs) TrimLeft(cutset string, s interface{}) string {
+func (StringFuncs) TrimLeft(cutset string, s any) string {
return strings.TrimLeft(conv.ToString(s), cutset)
}
// TrimPrefix -
-func (StringFuncs) TrimPrefix(cutset string, s interface{}) string {
+func (StringFuncs) TrimPrefix(cutset string, s any) string {
return strings.TrimPrefix(conv.ToString(s), cutset)
}
// TrimRight -
-func (StringFuncs) TrimRight(cutset string, s interface{}) string {
+func (StringFuncs) TrimRight(cutset string, s any) string {
return strings.TrimRight(conv.ToString(s), cutset)
}
// TrimSuffix -
-func (StringFuncs) TrimSuffix(cutset string, s interface{}) string {
+func (StringFuncs) TrimSuffix(cutset string, s any) string {
return strings.TrimSuffix(conv.ToString(s), cutset)
}
// Title -
-func (f *StringFuncs) Title(s interface{}) string {
+func (f *StringFuncs) Title(s any) string {
return cases.Title(f.tag, cases.NoLower).String(conv.ToString(s))
}
// ToUpper -
-func (f *StringFuncs) ToUpper(s interface{}) string {
+func (f *StringFuncs) ToUpper(s any) string {
return cases.Upper(f.tag).String(conv.ToString(s))
}
// ToLower -
-func (f *StringFuncs) ToLower(s interface{}) string {
+func (f *StringFuncs) ToLower(s any) string {
return cases.Lower(f.tag).String(conv.ToString(s))
}
// TrimSpace -
-func (StringFuncs) TrimSpace(s interface{}) string {
+func (StringFuncs) TrimSpace(s any) string {
return strings.TrimSpace(conv.ToString(s))
}
// Trunc -
-func (StringFuncs) Trunc(length int, s interface{}) string {
+func (StringFuncs) Trunc(length int, s any) string {
return gompstrings.Trunc(length, conv.ToString(s))
}
// Indent -
-func (StringFuncs) Indent(args ...interface{}) (string, error) {
+func (StringFuncs) Indent(args ...any) (string, error) {
indent := " "
width := 1
@@ -309,23 +309,23 @@ func (StringFuncs) Indent(args ...interface{}) (string, error) {
}
// Slug -
-func (StringFuncs) Slug(in interface{}) string {
+func (StringFuncs) Slug(in any) string {
return slug.Make(conv.ToString(in))
}
// Quote -
-func (StringFuncs) Quote(in interface{}) string {
+func (StringFuncs) Quote(in any) string {
return fmt.Sprintf("%q", conv.ToString(in))
}
// ShellQuote -
-func (StringFuncs) ShellQuote(in interface{}) string {
+func (StringFuncs) ShellQuote(in any) string {
val := reflect.ValueOf(in)
switch val.Kind() {
case reflect.Array, reflect.Slice:
var sb strings.Builder
vLen := val.Len()
- for n := 0; n < vLen; n++ {
+ for n := range vLen {
sb.WriteString(gompstrings.ShellQuote(conv.ToString(val.Index(n))))
if n+1 != vLen {
sb.WriteRune(' ')
@@ -337,29 +337,29 @@ func (StringFuncs) ShellQuote(in interface{}) string {
}
// Squote -
-func (StringFuncs) Squote(in interface{}) string {
+func (StringFuncs) Squote(in any) string {
s := conv.ToString(in)
s = strings.ReplaceAll(s, `'`, `''`)
return fmt.Sprintf("'%s'", s)
}
// SnakeCase -
-func (StringFuncs) SnakeCase(in interface{}) (string, error) {
+func (StringFuncs) SnakeCase(in any) (string, error) {
return gompstrings.SnakeCase(conv.ToString(in)), nil
}
// CamelCase -
-func (StringFuncs) CamelCase(in interface{}) (string, error) {
+func (StringFuncs) CamelCase(in any) (string, error) {
return gompstrings.CamelCase(conv.ToString(in)), nil
}
// KebabCase -
-func (StringFuncs) KebabCase(in interface{}) (string, error) {
+func (StringFuncs) KebabCase(in any) (string, error) {
return gompstrings.KebabCase(conv.ToString(in)), nil
}
// WordWrap -
-func (StringFuncs) WordWrap(args ...interface{}) (string, error) {
+func (StringFuncs) WordWrap(args ...any) (string, error) {
if len(args) == 0 || len(args) > 3 {
return "", fmt.Errorf("expected 1, 2, or 3 args, got %d", len(args))
}
@@ -404,7 +404,7 @@ func (StringFuncs) WordWrap(args ...interface{}) (string, error) {
}
// RuneCount - like len(s), but for runes
-func (StringFuncs) RuneCount(args ...interface{}) (int, error) {
+func (StringFuncs) RuneCount(args ...any) (int, error) {
s := ""
for _, arg := range args {
s += conv.ToString(arg)