module: use strings.ContainsRune in fileNameOK

tklauser · tklauser · commit 607370acc07b · 2021-08-16T07:22:36.000Z
As suggested by Ian for similar code on CL 326010. Change-Id: I7c6ca4191481daf253eba5f12e7079f5c3522e88 Reviewed-on: https://go-review.googlesource.com/c/mod/+/327029 Trust: Tobias Klauser <tobias.klauser@gmail.com> Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com> TryBot-Result: Go Bot <gobot@golang.org> Reviewed-by: Bryan C. Mills <bcmills@google.com>
diff --git a/module/module.go b/module/module.go
@@ -286,12 +286,7 @@ func fileNameOK(r rune) bool {
 		if '0' <= r && r <= '9' || 'A' <= r && r <= 'Z' || 'a' <= r && r <= 'z' {
 			return true
 		}
-		for i := 0; i < len(allowed); i++ {
-			if rune(allowed[i]) == r {
-				return true
-			}
-		}
-		return false
+		return strings.ContainsRune(allowed, r)
 	}
 	// It may be OK to add more ASCII punctuation here, but only carefully.
 	// For example Windows disallows < > \, and macOS disallows :, so we must not allow those.

Original file line number	Diff line number	Diff line change
`@@ -286,12 +286,7 @@ func fileNameOK(r rune) bool {`
`286`	`286`	`if '0' <= r && r <= '9' \|\| 'A' <= r && r <= 'Z' \|\| 'a' <= r && r <= 'z' {`
`287`	`287`	`return true`
`288`	`288`	`}`
`289`		`- for i := 0; i < len(allowed); i++ {`
`290`		`- if rune(allowed[i]) == r {`
`291`		`- return true`
`292`		`- }`
`293`		`- }`
`294`		`- return false`
	`289`	`+ return strings.ContainsRune(allowed, r)`
`295`	`290`	`}`
`296`	`291`	`// It may be OK to add more ASCII punctuation here, but only carefully.`
`297`	`292`	`// For example Windows disallows < > \, and macOS disallows :, so we must not allow those.`