From: qiulaidongfeng <2645477756@qq.com> Date: Mon, 6 May 2024 09:50:48 +0000 (+0000) Subject: io/fs: use slices.Contains X-Git-Tag: go1.23rc1~442 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=709d6d5d2201c5ee0a29ea6fd7c514b5bb4f3415;p=gostls13.git io/fs: use slices.Contains Change-Id: Ifd91722fd63af89af96a90dd69c73488f7fab5d3 GitHub-Last-Rev: da03963a07201ffca6ae9d50afdab121be8ad208 GitHub-Pull-Request: golang/go#67179 Reviewed-on: https://go-review.googlesource.com/c/go/+/583296 Auto-Submit: Ian Lance Taylor LUCI-TryBot-Result: Go LUCI Reviewed-by: Cherry Mui Reviewed-by: Ian Lance Taylor --- diff --git a/src/io/fs/glob_test.go b/src/io/fs/glob_test.go index d052eab371..c7c299d081 100644 --- a/src/io/fs/glob_test.go +++ b/src/io/fs/glob_test.go @@ -8,6 +8,7 @@ import ( . "io/fs" "os" "path" + "slices" "strings" "testing" ) @@ -30,7 +31,7 @@ func TestGlob(t *testing.T) { t.Errorf("Glob error for %q: %s", tt.pattern, err) continue } - if !contains(matches, tt.result) { + if !slices.Contains(matches, tt.result) { t.Errorf("Glob(%#q) = %#v want %v", tt.pattern, matches, tt.result) } } @@ -65,16 +66,6 @@ func TestCVE202230630(t *testing.T) { } } -// contains reports whether vector contains the string s. -func contains(vector []string, s string) bool { - for _, elem := range vector { - if elem == s { - return true - } - } - return false -} - type globOnly struct{ GlobFS } func (globOnly) Open(name string) (File, error) { return nil, ErrNotExist }