all: use strings.Cut even more

Change-Id: I943ce72c6f339589235bddbe10d07799c4e37979
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick
2022-03-19 12:42:46 -07:00
committed by Brad Fitzpatrick
parent f30473211b
commit f2041c9088
8 changed files with 14 additions and 25 deletions
+2 -3
View File
@@ -196,12 +196,11 @@ func maxDoHInFlight(goos string) int {
// Unknown iOS version, be cautious.
return 10
}
idx := strings.Index(ver, ".")
if idx == -1 {
major, _, ok := strings.Cut(ver, ".")
if !ok {
// Unknown iOS version, be cautious.
return 10
}
major := ver[:idx]
if m, err := strconv.Atoi(major); err != nil || m < 15 {
return 10
}
+3 -3
View File
@@ -37,13 +37,13 @@ func TestResolversWithDelays(t *testing.T) {
o := func(ss ...string) (rr []resolverAndDelay) {
for _, s := range ss {
var d time.Duration
if i := strings.Index(s, "+"); i != -1 {
s, durStr, hasPlus := strings.Cut(s, "+")
if hasPlus {
var err error
d, err = time.ParseDuration(s[i+1:])
d, err = time.ParseDuration(durStr)
if err != nil {
panic(fmt.Sprintf("parsing duration in %q: %v", s, err))
}
s = s[:i]
}
host, _, err := net.SplitHostPort(s)
if err != nil {