diff options
| author | Nathan VanBenschoten <nvanbenschoten@gmail.com> | 2015-12-22 02:40:47 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2016-02-19 01:06:05 +0000 |
| commit | b04f3b06ec347543b0eafe82dcfb0e05885d3feb (patch) | |
| tree | c9d889546ef895fce8b8a2c04c7e06cc998c1842 /src/regexp | |
| parent | 952c2fd606fad19b930937ca0d5c5571d7f5d4cb (diff) | |
| download | go-git-b04f3b06ec347543b0eafe82dcfb0e05885d3feb.tar.gz | |
all: replace strings.Index with strings.Contains where possible
Change-Id: Ia613f1c37bfce800ece0533a5326fca91d99a66a
Reviewed-on: https://go-review.googlesource.com/18120
Reviewed-by: Robert Griesemer <gri@golang.org>
Run-TryBot: Robert Griesemer <gri@golang.org>
Diffstat (limited to 'src/regexp')
| -rw-r--r-- | src/regexp/regexp.go | 2 | ||||
| -rw-r--r-- | src/regexp/syntax/regexp.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/regexp/regexp.go b/src/regexp/regexp.go index d7d0edb993..42ae6e1d7a 100644 --- a/src/regexp/regexp.go +++ b/src/regexp/regexp.go @@ -454,7 +454,7 @@ func Match(pattern string, b []byte) (matched bool, err error) { // in Expand, so for instance $1 represents the text of the first submatch. func (re *Regexp) ReplaceAllString(src, repl string) string { n := 2 - if strings.Index(repl, "$") >= 0 { + if strings.Contains(repl, "$") { n = 2 * (re.numSubexp + 1) } b := re.replaceAll(nil, src, n, func(dst []byte, match []int) []byte { diff --git a/src/regexp/syntax/regexp.go b/src/regexp/syntax/regexp.go index 75822cf981..ca5724063b 100644 --- a/src/regexp/syntax/regexp.go +++ b/src/regexp/syntax/regexp.go @@ -252,7 +252,7 @@ const meta = `\.+*?()|[]{}^$` func escape(b *bytes.Buffer, r rune, force bool) { if unicode.IsPrint(r) { - if strings.IndexRune(meta, r) >= 0 || force { + if strings.ContainsRune(meta, r) || force { b.WriteRune('\\') } b.WriteRune(r) |