Revert "Vendor update"

This reverts commit e5f062ee91.

vendor/gopkg.in/redis.v5/internal/proto/reader.go

@@ -29,14 +29,10 @@ type Reader struct {
 func NewReader(rd io.Reader) *Reader {
 	return &Reader{
 		src: bufio.NewReader(rd),
-		buf: make([]byte, 4096),
+		buf: make([]byte, 0, bufferSize),
 	}
 }
 
-func (r *Reader) Reset(rd io.Reader) {
-	r.src.Reset(rd)
-}
-
 func (p *Reader) PeekBuffered() []byte {
 	if n := p.src.Buffered(); n != 0 {
 		b, _ := p.src.Peek(n)
@@ -46,12 +42,7 @@ func (p *Reader) PeekBuffered() []byte {
 }
 
 func (p *Reader) ReadN(n int) ([]byte, error) {
-	b, err := readN(p.src, p.buf, n)
-	if err != nil {
-		return nil, err
-	}
-	p.buf = b
-	return b, nil
+	return readN(p.src, p.buf, n)
 }
 
 func (p *Reader) ReadLine() ([]byte, error) {
@@ -81,11 +72,11 @@ func (p *Reader) ReadReply(m MultiBulkParse) (interface{}, error) {
 	case ErrorReply:
 		return nil, ParseErrorReply(line)
 	case StatusReply:
-		return parseStatusValue(line), nil
+		return parseStatusValue(line)
 	case IntReply:
 		return parseInt(line[1:], 10, 64)
 	case StringReply:
-		return p.readTmpBytesValue(line)
+		return p.readBytesValue(line)
 	case ArrayReply:
 		n, err := parseArrayLen(line)
 		if err != nil {
@@ -120,9 +111,9 @@ func (p *Reader) ReadTmpBytesReply() ([]byte, error) {
 	case ErrorReply:
 		return nil, ParseErrorReply(line)
 	case StringReply:
-		return p.readTmpBytesValue(line)
+		return p.readBytesValue(line)
 	case StatusReply:
-		return parseStatusValue(line), nil
+		return parseStatusValue(line)
 	default:
 		return nil, fmt.Errorf("redis: can't parse string reply: %.100q", line)
 	}
@@ -219,7 +210,7 @@ func (p *Reader) ReadScanReply() ([]string, uint64, error) {
 	return keys, cursor, err
 }
 
-func (p *Reader) readTmpBytesValue(line []byte) ([]byte, error) {
+func (p *Reader) readBytesValue(line []byte) ([]byte, error) {
 	if isNilReply(line) {
 		return nil, internal.Nil
 	}
@@ -306,8 +297,8 @@ func ParseErrorReply(line []byte) error {
 	return internal.RedisError(string(line[1:]))
 }
 
-func parseStatusValue(line []byte) []byte {
-	return line[1:]
+func parseStatusValue(line []byte) ([]byte, error) {
+	return line[1:], nil
 }
 
 func parseArrayLen(line []byte) (int64, error) {

vendor/gopkg.in/redis.v5/internal/proto/scan.go

@@ -3,7 +3,6 @@ package proto
 import (
 	"encoding"
 	"fmt"
-	"reflect"
 
 	"gopkg.in/redis.v5/internal"
 )
@@ -106,26 +105,3 @@ func Scan(b []byte, v interface{}) error {
 			"redis: can't unmarshal %T (consider implementing BinaryUnmarshaler)", v)
 	}
 }
-
-func ScanSlice(data []string, slice interface{}) error {
-	v := reflect.ValueOf(slice)
-	if !v.IsValid() {
-		return fmt.Errorf("redis: ScanSlice(nil)")
-	}
-	if v.Kind() != reflect.Ptr {
-		return fmt.Errorf("redis: ScanSlice(non-pointer %T)", slice)
-	}
-	v = v.Elem()
-	if v.Kind() != reflect.Slice {
-		return fmt.Errorf("redis: ScanSlice(non-slice %T)", slice)
-	}
-
-	for i, s := range data {
-		elem := internal.SliceNextElem(v)
-		if err := Scan([]byte(s), elem.Addr().Interface()); err != nil {
-			return fmt.Errorf("redis: ScanSlice(index=%d value=%q) failed: %s", i, s, err)
-		}
-	}
-
-	return nil
-}

vendor/gopkg.in/redis.v5/internal/proto/writebuffer.go

@@ -8,13 +8,11 @@ import (
 
 const bufferSize = 4096
 
-type WriteBuffer struct {
-	b []byte
-}
+type WriteBuffer struct{ b []byte }
 
 func NewWriteBuffer() *WriteBuffer {
 	return &WriteBuffer{
-		b: make([]byte, 0, 4096),
+		b: make([]byte, 0, bufferSize),
 	}
 }