golint cleanup

Author: judwhite

encode_test.go

@@ -125,8 +125,8 @@ func TestMarshalKeyvals(t *testing.T) {
 if err != d.err {
 t.Errorf("%#v: got error: %v, want error: %v", d.in, err, d.err)
 }
-if got, want := got, d.want; !reflect.DeepEqual(got, want) {
-t.Errorf("%#v: got '%s', want '%s'", d.in, got, want)
+if !reflect.DeepEqual(got, d.want) {
+t.Errorf("%#v: got '%s', want '%s'", d.in, got, d.want)
 }
 }
 }
@@ -181,12 +181,12 @@ func (t marshalerStringer) String() string {
 return fmt.Sprint(t.a + t.b)
 }
 
-var marshalError = errors.New("marshal error")
+var errMarshal = errors.New("marshal error")
 
 type errorMarshaler struct{}
 
 func (errorMarshaler) MarshalText() ([]byte, error) {
-return nil, marshalError
+return nil, errMarshal
 }
 
 func BenchmarkEncodeKeyval(b *testing.B) {

fuzz.go

@@ -12,21 +12,22 @@ import (
 kr "github.com/kr/logfmt"
 )
 
+// Fuzz checks reserialized data matches
 func Fuzz(data []byte) int {
 parsed, err := parse(data)
 if err != nil {
 return 0
 }
 var w1 bytes.Buffer
-if err := write(parsed, &w1); err != nil {
+if err = write(parsed, &w1); err != nil {
 panic(err)
 }
 parsed, err = parse(data)
 if err != nil {
 panic(err)
 }
 var w2 bytes.Buffer
-if err := write(parsed, &w2); err != nil {
+if err = write(parsed, &w2); err != nil {
 panic(err)
 }
 if !bytes.Equal(w1.Bytes(), w2.Bytes()) {
@@ -35,6 +36,7 @@ func Fuzz(data []byte) int {
 return 1
 }
 
+// FuzzVsKR checks go-logfmt/logfmt against kr/logfmt
 func FuzzVsKR(data []byte) int {
 parsed, err := parse(data)
 parsedKR, errKR := parseKR(data)