Skip to content

Commit

Permalink
all: prefer bytes.IndexByte over bytes.Index
Browse files Browse the repository at this point in the history
bytes.IndexByte can be used wherever the second argument to
strings.Index is exactly one byte long, so we do that with this change.

This avoids generating unnecessary string symbols/converison and saves
a few calls to bytes.Index.

Change-Id: If31c775790e01edfece1169e398ad6a754fb4428
Reviewed-on: https://go-review.googlesource.com/66373
Run-TryBot: Brad Fitzpatrick <[email protected]>
Reviewed-by: Ian Lance Taylor <[email protected]>
  • Loading branch information
stemar94 authored and ianlancetaylor committed Sep 27, 2017
1 parent d2826d3 commit 5e42658
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/cmd/link/internal/ld/lib.go
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,7 @@ func genhash(ctxt *Link, lib *Library) {
Errorf(nil, "%s: error reading package data: %v", lib.File, err)
return
}
firstEOL := bytes.Index(pkgDefBytes, []byte("\n"))
firstEOL := bytes.IndexByte(pkgDefBytes, '\n')
if firstEOL < 0 {
Errorf(nil, "cannot parse package data of %s for hash generation, no newline found", lib.File)
return
Expand Down
2 changes: 1 addition & 1 deletion src/crypto/tls/handshake_client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func (o *opensslOutputSink) Write(data []byte) (n int, err error) {
o.all = append(o.all, data...)

for {
i := bytes.Index(o.line, []byte{'\n'})
i := bytes.IndexByte(o.line, '\n')
if i < 0 {
break
}
Expand Down
2 changes: 1 addition & 1 deletion src/encoding/json/decode_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func (u unmarshalerText) MarshalText() ([]byte, error) {
}

func (u *unmarshalerText) UnmarshalText(b []byte) error {
pos := bytes.Index(b, []byte(":"))
pos := bytes.IndexByte(b, ':')
if pos == -1 {
return errors.New("missing separator")
}
Expand Down
4 changes: 2 additions & 2 deletions src/encoding/pem/pem.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ type Block struct {
// bytes) is also returned and this will always be smaller than the original
// argument.
func getLine(data []byte) (line, rest []byte) {
i := bytes.Index(data, []byte{'\n'})
i := bytes.IndexByte(data, '\n')
var j int
if i < 0 {
i = len(data)
Expand Down Expand Up @@ -106,7 +106,7 @@ func Decode(data []byte) (p *Block, rest []byte) {
}
line, next := getLine(rest)

i := bytes.Index(line, []byte{':'})
i := bytes.IndexByte(line, ':')
if i == -1 {
break
}
Expand Down

0 comments on commit 5e42658

Please sign in to comment.