Update dependencies

vendor/github.com/mailru/easyjson/jlexer/lexer.go

@@ -5,7 +5,6 @@
 package jlexer
 
 import (
-	"encoding/base64"
 	"fmt"
 	"io"
 	"reflect"
@@ -506,7 +505,7 @@ func (r *Lexer) SkipRecursive() {
 				return
 			}
 		case c == '\\' && inQuotes:
-			wasEscape = !wasEscape
+			wasEscape = true
 			continue
 		case c == '"' && inQuotes:
 			inQuotes = wasEscape
@@ -516,11 +515,7 @@ func (r *Lexer) SkipRecursive() {
 		wasEscape = false
 	}
 	r.pos = len(r.Data)
-	r.err = &LexerError{
-		Reason: "EOF reached while skipping array/object or token",
-		Offset: r.pos,
-		Data:   string(r.Data[r.pos:]),
-	}
+	r.err = io.EOF
 }
 
 // Raw fetches the next item recursively as a data slice
@@ -532,34 +527,6 @@ func (r *Lexer) Raw() []byte {
 	return r.Data[r.start:r.pos]
 }
 
-// IsStart returns whether the lexer is positioned at the start
-// of an input string.
-func (r *Lexer) IsStart() bool {
-	return r.pos == 0
-}
-
-// Consumed reads all remaining bytes from the input, publishing an error if
-// there is anything but whitespace remaining.
-func (r *Lexer) Consumed() {
-	if r.pos > len(r.Data) {
-		return
-	}
-
-	for _, c := range r.Data[r.pos:] {
-		if c != ' ' && c != '\t' && c != '\r' && c != '\n' {
-			r.err = &LexerError{
-				Reason: "invalid character '" + string(c) + "' after top-level value",
-				Offset: r.pos,
-				Data:   string(r.Data[r.pos:]),
-			}
-			return
-		}
-
-		r.pos++
-		r.start++
-	}
-}
-
 // UnsafeString returns the string value if the token is a string literal.
 //
 // Warning: returned string may point to the input buffer, so the string should not outlive
@@ -593,28 +560,6 @@ func (r *Lexer) String() string {
 	return ret
 }
 
-// Bytes reads a string literal and base64 decodes it into a byte slice.
-func (r *Lexer) Bytes() []byte {
-	if r.token.kind == tokenUndef && r.Ok() {
-		r.fetchToken()
-	}
-	if !r.Ok() || r.token.kind != tokenString {
-		r.errInvalidToken("string")
-		return nil
-	}
-	ret := make([]byte, base64.StdEncoding.DecodedLen(len(r.token.byteValue)))
-	len, err := base64.StdEncoding.Decode(ret, r.token.byteValue)
-	if err != nil {
-		r.err = &LexerError{
-			Reason: err.Error(),
-		}
-		return nil
-	}
-
-	r.consume()
-	return ret[:len]
-}
-
 // Bool reads a true or false boolean keyword.
 func (r *Lexer) Bool() bool {
 	if r.token.kind == tokenUndef && r.Ok() {

vendor/github.com/mailru/easyjson/jwriter/writer.go

@@ -2,7 +2,6 @@
 package jwriter
 
 import (
-	"encoding/base64"
 	"io"
 	"strconv"
 	"unicode/utf8"
@@ -10,19 +9,8 @@ import (
 	"github.com/mailru/easyjson/buffer"
 )
 
-// Flags describe various encoding options. The behavior may be actually implemented in the encoder, but
-// Flags field in Writer is used to set and pass them around.
-type Flags int
-
-const (
-	NilMapAsEmpty   Flags = 1 << iota // Encode nil map as '{}' rather than 'null'.
-	NilSliceAsEmpty                   // Encode nil slice as '[]' rather than 'null'.
-)
-
 // Writer is a JSON writer.
 type Writer struct {
-	Flags Flags
-
 	Error  error
 	Buffer buffer.Buffer
 }
@@ -71,19 +59,6 @@ func (w *Writer) Raw(data []byte, err error) {
 	}
 }
 
-// Base64Bytes appends data to the buffer after base64 encoding it
-func (w *Writer) Base64Bytes(data []byte) {
-	if data == nil {
-		w.Buffer.AppendString("null")
-		return
-	}
-	w.Buffer.AppendByte('"')
-	dst := make([]byte, base64.StdEncoding.EncodedLen(len(data)))
-	base64.StdEncoding.Encode(dst, data)
-	w.Buffer.AppendBytes(dst)
-	w.Buffer.AppendByte('"')
-}
-
 func (w *Writer) Uint8(n uint8) {
 	w.Buffer.EnsureSpace(3)
 	w.Buffer.Buf = strconv.AppendUint(w.Buffer.Buf, uint64(n), 10)
@@ -225,12 +200,6 @@ func (w *Writer) Bool(v bool) {
 
 const chars = "0123456789abcdef"
 
-func isNotEscapedSingleChar(c byte) bool {
-	// Note: might make sense to use a table if there are more chars to escape. With 4 chars
-	// it benchmarks the same.
-	return c != '<' && c != '\\' && c != '"' && c != '>' && c >= 0x20 && c < utf8.RuneSelf
-}
-
 func (w *Writer) String(s string) {
 	w.Buffer.AppendByte('"')
 
@@ -240,32 +209,39 @@ func (w *Writer) String(s string) {
 	p := 0 // last non-escape symbol
 
 	for i := 0; i < len(s); {
-		c := s[i]
-
-		if isNotEscapedSingleChar(c) {
-			// single-width character, no escaping is required
-			i++
-			continue
-		} else if c < utf8.RuneSelf {
-			// single-with character, need to escape
-			w.Buffer.AppendString(s[p:i])
+		// single-with character
+		if c := s[i]; c < utf8.RuneSelf {
+			var escape byte
 			switch c {
 			case '\t':
-				w.Buffer.AppendString(`\t`)
+				escape = 't'
 			case '\r':
-				w.Buffer.AppendString(`\r`)
+				escape = 'r'
 			case '\n':
-				w.Buffer.AppendString(`\n`)
+				escape = 'n'
 			case '\\':
-				w.Buffer.AppendString(`\\`)
+				escape = '\\'
 			case '"':
-				w.Buffer.AppendString(`\"`)
+				escape = '"'
+			case '<', '>':
+				// do nothing
 			default:
+				if c >= 0x20 {
+					// no escaping is required
+					i++
+					continue
+				}
+			}
+			if escape != 0 {
+				w.Buffer.AppendString(s[p:i])
+				w.Buffer.AppendByte('\\')
+				w.Buffer.AppendByte(escape)
+			} else {
+				w.Buffer.AppendString(s[p:i])
 				w.Buffer.AppendString(`\u00`)
 				w.Buffer.AppendByte(chars[c>>4])
 				w.Buffer.AppendByte(chars[c&0xf])
 			}
-
 			i++
 			p = i
 			continue