diff options
| author | Rui Ueyama <ruiu@google.com> | 2014-03-19 12:13:47 -0700 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2014-03-19 12:13:47 -0700 |
| commit | cc4bdf0226f192432a0d7c95b02cf3ecced81c15 (patch) | |
| tree | b9b77937cac7d031e9f8dd14318a880ac44e04ff /src/pkg/strings | |
| parent | 79b3daa97722c71d73b519b062078b9296a36051 (diff) | |
| download | go-cc4bdf0226f192432a0d7c95b02cf3ecced81c15.tar.xz | |
strings, bytes: ReadAt should not mutate receiver
CL 77580046 caused a data race issue with tests that assumes ReadAt
does not mutate receiver. This patch partially revert CL 77580046
to fix it.
LGTM=bradfitz
R=golang-codereviews, bradfitz
CC=golang-codereviews
https://golang.org/cl/77900043
Diffstat (limited to 'src/pkg/strings')
| -rw-r--r-- | src/pkg/strings/reader.go | 1 | ||||
| -rw-r--r-- | src/pkg/strings/strings_test.go | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/pkg/strings/reader.go b/src/pkg/strings/reader.go index df4d807120..75bf07b377 100644 --- a/src/pkg/strings/reader.go +++ b/src/pkg/strings/reader.go @@ -42,7 +42,6 @@ func (r *Reader) Read(b []byte) (n int, err error) { } func (r *Reader) ReadAt(b []byte, off int64) (n int, err error) { - r.prevRune = -1 if off < 0 { return 0, errors.New("strings: invalid offset") } diff --git a/src/pkg/strings/strings_test.go b/src/pkg/strings/strings_test.go index 5c38965775..8347818d59 100644 --- a/src/pkg/strings/strings_test.go +++ b/src/pkg/strings/strings_test.go @@ -863,7 +863,6 @@ var UnreadRuneErrorTests = []struct { f func(*Reader) }{ {"Read", func(r *Reader) { r.Read([]byte{}) }}, - {"ReadAt", func(r *Reader) { r.ReadAt([]byte{}, 0) }}, {"ReadByte", func(r *Reader) { r.ReadByte() }}, {"UnreadRune", func(r *Reader) { r.UnreadRune() }}, {"Seek", func(r *Reader) { r.Seek(0, 1) }}, |