Rename InvalidEncodingErr to ErrInvalidEncoding

Author: bernerdschaefer

decoder.go

@@ -21,7 +21,7 @@ func NewDecoder(r io.Reader) *Decoder {
 
 // ReadField reads a single line from the stream and parses it as a field. A
 // complete event is signalled by an empty key and value. The returned error
-// may either be an error from the stream, or an InvalidEncodingErr if the
+// may either be an error from the stream, or an ErrInvalidEncoding if the
 // value is not valid UTF-8.
 func (d *Decoder) ReadField() (field string, value []byte, err error) {
 	var buf []byte
@@ -57,7 +57,7 @@ func (d *Decoder) ReadField() (field string, value []byte, err error) {
 	}
 
 	if !utf8.ValidString(field) || !utf8.Valid(value) {
-		err = InvalidEncodingErr
+		err = ErrInvalidEncoding
 	}
 
 	return

decoder_test.go

@@ -28,8 +28,8 @@ func TestDecoderReadField(t *testing.T) {
 		{"id:1", "id", []byte("1"), nil},
 		{"id: 1", "id", []byte("1"), nil},
 		{"data: " + longLine(), "data", []byte(longLine()), nil},
-		{"\xFF\xFE\xFD", "\xFF\xFE\xFD", nil, InvalidEncodingErr},
-		{"data: \xFF\xFE\xFD", "data", []byte("\xFF\xFE\xFD"), InvalidEncodingErr},
+		{"\xFF\xFE\xFD", "\xFF\xFE\xFD", nil, ErrInvalidEncoding},
+		{"data: \xFF\xFE\xFD", "data", []byte("\xFF\xFE\xFD"), ErrInvalidEncoding},
 	}
 
 	for i, tt := range table {

encoder.go

@@ -43,11 +43,11 @@ func (e *Encoder) Flush() error {
 
 // WriteField writes an event field to the connection. If the provided value
 // contains newlines, multiple fields will be emitted. If the returned error is
-// not nil, it will be either InvalidEncodingErr or an error from the
+// not nil, it will be either ErrInvalidEncoding or an error from the
 // connection.
 func (e *Encoder) WriteField(field string, value []byte) error {
 	if !utf8.ValidString(field) || !utf8.Valid(value) {
-		return InvalidEncodingErr
+		return ErrInvalidEncoding
 	}
 
 	for _, line := range bytes.Split(value, []byte{'\n'}) {

encoder_test.go

@@ -14,8 +14,8 @@ func TestWriteField(t *testing.T) {
 	}{
 		{"data", []byte("data"), "data: data\n", nil},
 		{"data", nil, "data\n", nil},
-		{"\xFF\xFE\xFD", nil, "", InvalidEncodingErr},
-		{"data", []byte("\xFF\xFE\xFD"), "", InvalidEncodingErr},
+		{"\xFF\xFE\xFD", nil, "", ErrInvalidEncoding},
+		{"data", []byte("\xFF\xFE\xFD"), "", ErrInvalidEncoding},
 		{"data", []byte("a\nb\nc\n"), "data: a\ndata: b\ndata: c\ndata\n", nil},
 		{"data", []byte("a\r\nb\r\nc"), "data: a\ndata: b\ndata: c\n", nil},
 	}

eventsource.go

@@ -17,9 +17,9 @@ var (
 	// reopened.
 	ErrClosed = errors.New("closed")
 
-	// InvalidEncodingErr is returned by Encoder and Decoder when invalid UTF-8
+	// ErrInvalidEncoding is returned by Encoder and Decoder when invalid UTF-8
 	// event data is encountered.
-	InvalidEncodingErr = errors.New("invalid UTF-8 sequence")
+	ErrInvalidEncoding = errors.New("invalid UTF-8 sequence")
 )
 
 // An Event is a message can be written to an event stream and read from an
@@ -118,7 +118,7 @@ func (es *EventSource) Read() (Event, error) {
 
 		err := es.dec.Decode(&e)
 
-		if err == InvalidEncodingErr {
+		if err == ErrInvalidEncoding {
 			continue
 		}