all: use strings.Cut even more

Change-Id: I943ce72c6f339589235bddbe10d07799c4e37979
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>

net/dns/resolvconffile/resolvconffile.go

@@ -65,10 +65,7 @@ func Parse(r io.Reader) (*Config, error) {
 	scanner := bufio.NewScanner(r)
 	for scanner.Scan() {
 		line := scanner.Text()
-		i := strings.IndexByte(line, '#')
-		if i >= 0 {
-			line = line[:i]
-		}
+		line, _, _ = strings.Cut(line, "#") // remove any comments
 		line = strings.TrimSpace(line)
 
 		if strings.HasPrefix(line, "nameserver") {

net/dns/resolver/forwarder.go

@@ -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
 	}

net/dns/resolver/forwarder_test.go

@@ -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 {