From acc757f678a42ba1ffbf8bb9886de4fe080302de Mon Sep 17 00:00:00 2001 From: Joe Tsai Date: Tue, 5 Apr 2016 11:22:53 -0700 Subject: all: use SeekStart, SeekCurrent, SeekEnd CL/19862 (f79b50b8d5bc159561c1dcf7c17e2a0db96a9a11) recently introduced the constants SeekStart, SeekCurrent, and SeekEnd to the io package. We should use these constants consistently throughout the code base. Updates #15269 Change-Id: If7fcaca7676e4a51f588528f5ced28220d9639a2 Reviewed-on: https://go-review.googlesource.com/22097 Reviewed-by: Brad Fitzpatrick Run-TryBot: Joe Tsai TryBot-Result: Gobot Gobot --- src/bytes/reader.go | 6 +++--- src/bytes/reader_test.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/bytes') diff --git a/src/bytes/reader.go b/src/bytes/reader.go index 83826c80c4..28cfc7a978 100644 --- a/src/bytes/reader.go +++ b/src/bytes/reader.go @@ -108,11 +108,11 @@ func (r *Reader) Seek(offset int64, whence int) (int64, error) { r.prevRune = -1 var abs int64 switch whence { - case 0: + case io.SeekStart: abs = offset - case 1: + case io.SeekCurrent: abs = r.i + offset - case 2: + case io.SeekEnd: abs = int64(len(r.s)) + offset default: return 0, errors.New("bytes.Reader.Seek: invalid whence") diff --git a/src/bytes/reader_test.go b/src/bytes/reader_test.go index b5c7850618..7b3034d4e0 100644 --- a/src/bytes/reader_test.go +++ b/src/bytes/reader_test.go @@ -188,7 +188,7 @@ var UnreadRuneErrorTests = []struct { {"Read", func(r *Reader) { r.Read([]byte{0}) }}, {"ReadByte", func(r *Reader) { r.ReadByte() }}, {"UnreadRune", func(r *Reader) { r.UnreadRune() }}, - {"Seek", func(r *Reader) { r.Seek(0, 1) }}, + {"Seek", func(r *Reader) { r.Seek(0, io.SeekCurrent) }}, {"WriteTo", func(r *Reader) { r.WriteTo(&Buffer{}) }}, } -- cgit v1.3