Update linting

wader · Jan 20, 2022 · 16849c8 · 16849c8
1 parent 6e1f338
commit 16849c8
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 22 deletions.
diff --git a/format/all/all.go b/format/all/all.go
@@ -6,9 +6,9 @@ import (
 	_ "github.com/wader/fq/format/ape"
 	_ "github.com/wader/fq/format/ar"
 	_ "github.com/wader/fq/format/av1"
+	_ "github.com/wader/fq/format/avro"
 	_ "github.com/wader/fq/format/bencode"
 	_ "github.com/wader/fq/format/bson"
-	_ "github.com/wader/fq/format/avro"
 	_ "github.com/wader/fq/format/bzip2"
 	_ "github.com/wader/fq/format/cbor"
 	_ "github.com/wader/fq/format/dns"

diff --git a/format/avro/decoders/array.go b/format/avro/decoders/array.go
@@ -3,13 +3,12 @@ package decoders
 import (
 	"errors"
 	"fmt"
-	"github.com/wader/fq/pkg/scalar"
 
 	"github.com/wader/fq/format/avro/schema"
 	"github.com/wader/fq/pkg/decode"
 )
 
-func decodeArrayFn(schema schema.SimplifiedSchema, sms ...scalar.Mapper) (DecodeFn, error) {
+func decodeArrayFn(schema schema.SimplifiedSchema) (DecodeFn, error) {
 	if schema.Items == nil {
 		return nil, errors.New("array schema must have items")
 	}

diff --git a/format/avro/decoders/bool.go b/format/avro/decoders/bool.go
@@ -1,16 +1,15 @@
 package decoders
 
 import (
-	"github.com/wader/fq/format/avro/schema"
 	"github.com/wader/fq/pkg/decode"
 	"github.com/wader/fq/pkg/scalar"
 )
 
-func decodeBoolFn(schema schema.SimplifiedSchema, sms ...scalar.Mapper) (DecodeFn, error) {
+func decodeBoolFn(sms ...scalar.Mapper) (DecodeFn, error) {
 	// A boolean is written as a single byte whose value is either 0 (false) or 1 (true).
 	return func(name string, d *decode.D) interface{} {
 		return d.FieldBoolFn(name, func(d *decode.D) bool {
 			return d.U8() >= 1
-		})
+		}, sms...)
 	}, nil
 }
diff --git a/format/avro/decoders/bytes.go b/format/avro/decoders/bytes.go
@@ -1,14 +1,13 @@
 package decoders
 
 import (
-	"github.com/wader/fq/format/avro/schema"
 	"github.com/wader/fq/pkg/decode"
 	"github.com/wader/fq/pkg/scalar"
 )
 
 type BytesCodec struct{}
 
-func decodeBytesFn(schema schema.SimplifiedSchema, sms ...scalar.Mapper) (DecodeFn, error) {
+func decodeBytesFn(sms ...scalar.Mapper) (DecodeFn, error) {
 	// Bytes are encoded as a long followed by that many bytes of data.
 	return func(name string, d *decode.D) interface{} {
 		var val []byte

diff --git a/format/avro/decoders/decoders.go b/format/avro/decoders/decoders.go
@@ -2,6 +2,7 @@ package decoders
 
 import (
 	"fmt"
+
 	"github.com/wader/fq/format/avro/schema"
 	"github.com/wader/fq/pkg/decode"
 	"github.com/wader/fq/pkg/scalar"
@@ -18,11 +19,11 @@ func DecodeFnForSchema(s schema.SimplifiedSchema) (DecodeFn, error) {
 
 	switch s.Type {
 	case schema.ARRAY:
-		return decodeArrayFn(s, sms...)
+		return decodeArrayFn(s)
 	case schema.BOOLEAN:
-		return decodeBoolFn(s, sms...)
+		return decodeBoolFn(sms...)
 	case schema.BYTES:
-		return decodeBytesFn(s, sms...)
+		return decodeBytesFn(sms...)
 	case schema.DOUBLE:
 		return decodeDoubleFn(s, sms...)
 	case schema.ENUM:
@@ -38,13 +39,13 @@ func DecodeFnForSchema(s schema.SimplifiedSchema) (DecodeFn, error) {
 	case schema.NULL:
 		return decodeNullFn(s, sms...)
 	case schema.RECORD:
-		return decodeRecordFn(s, sms...)
+		return decodeRecordFn(s)
 	case schema.STRING:
 		return decodeStringFn(s, sms...)
 	case schema.UNION:
-		return decodeUnionFn(s, sms...)
+		return decodeUnionFn(s)
 	case schema.MAP:
-		return decodeMapFn(s, sms...)
+		return decodeMapFn(s)
 	default:
 		return nil, fmt.Errorf("unknown type: %s", s.Type)
 	}

diff --git a/format/avro/decoders/fixed.go b/format/avro/decoders/fixed.go
@@ -2,6 +2,7 @@ package decoders
 
 import (
 	"errors"
+
 	"github.com/wader/fq/pkg/scalar"
 
 	"github.com/wader/fq/format/avro/schema"

diff --git a/format/avro/decoders/logicaltypes.go b/format/avro/decoders/logicaltypes.go
@@ -2,9 +2,10 @@ package decoders
 
 import (
 	"errors"
+	"time"
+
 	"github.com/wader/fq/format/avro/schema"
 	"github.com/wader/fq/pkg/scalar"
-	"time"
 )
 
 type Precision int

diff --git a/format/avro/decoders/map.go b/format/avro/decoders/map.go
@@ -3,13 +3,12 @@ package decoders
 import (
 	"errors"
 	"fmt"
-	"github.com/wader/fq/pkg/scalar"
 
 	"github.com/wader/fq/format/avro/schema"
 	"github.com/wader/fq/pkg/decode"
 )
 
-func decodeMapFn(s schema.SimplifiedSchema, sms ...scalar.Mapper) (DecodeFn, error) {
+func decodeMapFn(s schema.SimplifiedSchema) (DecodeFn, error) {
 	if s.Values == nil {
 		return nil, errors.New("map schema must have values")
 	}

diff --git a/format/avro/decoders/null.go b/format/avro/decoders/null.go
@@ -9,7 +9,7 @@ import (
 func decodeNullFn(schema schema.SimplifiedSchema, sms ...scalar.Mapper) (DecodeFn, error) {
 	// null is written as zero bytes.
 	return func(name string, d *decode.D) interface{} {
-		d.FieldRawLen(name, 0)
+		d.FieldValueNil(name)
 		return nil
 	}, nil
 }
diff --git a/format/avro/decoders/record.go b/format/avro/decoders/record.go
@@ -2,13 +2,12 @@ package decoders
 
 import (
 	"fmt"
-	"github.com/wader/fq/pkg/scalar"
 
 	"github.com/wader/fq/format/avro/schema"
 	"github.com/wader/fq/pkg/decode"
 )
 
-func decodeRecordFn(schema schema.SimplifiedSchema, sms ...scalar.Mapper) (DecodeFn, error) {
+func decodeRecordFn(schema schema.SimplifiedSchema) (DecodeFn, error) {
 	if len(schema.Fields) == 0 {
 		return nil, fmt.Errorf("record must have fields")
 	}

diff --git a/format/avro/decoders/union.go b/format/avro/decoders/union.go
@@ -3,13 +3,12 @@ package decoders
 import (
 	"errors"
 	"fmt"
-	"github.com/wader/fq/pkg/scalar"
 
 	"github.com/wader/fq/format/avro/schema"
 	"github.com/wader/fq/pkg/decode"
 )
 
-func decodeUnionFn(schema schema.SimplifiedSchema, sms ...scalar.Mapper) (DecodeFn, error) {
+func decodeUnionFn(schema schema.SimplifiedSchema) (DecodeFn, error) {
 	if len(schema.UnionTypes) == 0 {
 		return nil, errors.New("union must have types")
 	}