From 859e4d51c30dce31eaa0d11ad1477a5465a194e7 Mon Sep 17 00:00:00 2001 From: Robert Griesemer Date: Thu, 25 Feb 2010 10:02:39 -0800 Subject: [PATCH] strings: remove a couple of redundant tests (per suggestion from Heresy.Mc@gmail.com) R=rsc CC=golang-dev https://golang.org/cl/223052 --- src/pkg/strings/strings.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pkg/strings/strings.go b/src/pkg/strings/strings.go index 48d4f0e96a..eb2b7e09c6 100644 --- 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 } }