strings: remove a couple of redundant tests

(per suggestion from Heresy.Mc@gmail.com)

R=rsc
CC=golang-dev
https://golang.org/cl/223052

diff --git a/src/pkg/strings/strings.go b/src/pkg/strings/strings.go
index 48d4f0e96a3f411335ecd99f557371706db7f965..eb2b7e09c61cec5358b942ffa11c8ae10b295f72 100644 (file)
--- a/src/pkg/strings/strings.go
+++ b/src/pkg/strings/strings.go
@@ -65,8 +65,9 @@ func Index(s, sep string) int {
                }
                return -1
        }
+       // n > 1
        for i := 0; i+n <= len(s); i++ {
-               if s[i] == c && (n == 1 || s[i:i+n] == sep) {
+               if s[i] == c && s[i:i+n] == sep {
                        return i
                }
        }
@@ -89,8 +90,9 @@ func LastIndex(s, sep string) int {
                }
                return -1
        }
+       // n > 1
        for i := len(s) - n; i >= 0; i-- {
-               if s[i] == c && (n == 1 || s[i:i+n] == sep) {
+               if s[i] == c && s[i:i+n] == sep {
                        return i
                }
        }