go/task
go/task
1
0
Fork 0
mirror of https://github.com/go-task/task.git synced 2025-01-18 04:59:01 +02:00
Code Issues Releases Activity

refactor: use x/exp/slices instead of custom contains function

Browse Source
This commit is contained in:
Pete Davison 2022-09-17 23:25:55 +00:00
parent d33906b6e4
commit 8ec89f1bbd
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
taskfile/included_taskfile.go
View File

@ -7,6 +7,7 @@ import (
"github.com/go-task/task/v3/internal/execext" "github.com/go-task/task/v3/internal/execext"
"github.com/go-task/task/v3/internal/filepathext" "github.com/go-task/task/v3/internal/filepathext"
"golang.org/x/exp/slices"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
) )
@ -72,7 +73,7 @@ func (tfs *IncludedTaskfiles) Set(key string, includedTaskfile IncludedTaskfile)
if tfs.Mapping == nil { if tfs.Mapping == nil {
tfs.Mapping = make(map[string]IncludedTaskfile, 1) tfs.Mapping = make(map[string]IncludedTaskfile, 1)
} }
if !stringSliceContains(tfs.Keys, key) { if !slices.Contains(tfs.Keys, key) {
tfs.Keys = append(tfs.Keys, key) tfs.Keys = append(tfs.Keys, key)
} }
tfs.Mapping[key] = includedTaskfile tfs.Mapping[key] = includedTaskfile

10
taskfile/slice.go
View File

@ -1,10 +0,0 @@
package taskfile
func stringSliceContains(s []string, str string) bool {
for _, v := range s {
if v == str {
return true
}
}
return false
}

3
taskfile/var.go
View File

@ -3,6 +3,7 @@ package taskfile
import ( import (
"errors" "errors"
"golang.org/x/exp/slices"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
) )
@ -59,7 +60,7 @@ func (vs *Vars) Set(key string, value Var) {
if vs.Mapping == nil { if vs.Mapping == nil {
vs.Mapping = make(map[string]Var, 1) vs.Mapping = make(map[string]Var, 1)
} }
if !stringSliceContains(vs.Keys, key) { if !slices.Contains(vs.Keys, key) {
vs.Keys = append(vs.Keys, key) vs.Keys = append(vs.Keys, key)
} }
vs.Mapping[key] = value vs.Mapping[key] = value