Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

bytes, strings: declare variables inside loop they're used in

Browse source 
The recently updated Count functions declare variables before
special-cased returns.

Change-Id: I8f726118336b7b0ff72117d12adc48b6e37e60ea
Reviewed-on: https://go-review.googlesource.com/39357
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Eric Lagergren 2017-04-03 16:08:13 -07:00 • committed by Brad Fitzpatrick
parent 42426ed411
commit 59f6549d1c
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/bytes/bytes.go
View file

@ -48,11 +48,11 @@ func explode(s []byte, n int) [][]byte {
// countGeneric actually implements Count // countGeneric actually implements Count
func countGeneric(s, sep []byte) int { func countGeneric(s, sep []byte) int {
n := 0
// special case // special case
if len(sep) == 0 { if len(sep) == 0 {
return utf8.RuneCount(s) + 1 return utf8.RuneCount(s) + 1
} }
n := 0
for { for {
i := Index(s, sep) i := Index(s, sep)
if i == -1 { if i == -1 {

2
src/strings/strings.go
View file

@ -75,11 +75,11 @@ func hashStrRev(sep string) (uint32, uint32) {
// Count counts the number of non-overlapping instances of substr in s. // Count counts the number of non-overlapping instances of substr in s.
// If substr is an empty string, Count returns 1 + the number of Unicode code points in s. // If substr is an empty string, Count returns 1 + the number of Unicode code points in s.
func Count(s, substr string) int { func Count(s, substr string) int {
n := 0
// special case // special case
if len(substr) == 0 { if len(substr) == 0 {
return utf8.RuneCountInString(s) + 1 return utf8.RuneCountInString(s) + 1
} }
n := 0
for { for {
i := Index(s, substr) i := Index(s, substr)
if i == -1 { if i == -1 {