multi: Move each serializer into its own package

structdef_avro.go → internal/serializers/avro/structdef_avro.go

@@ -1,4 +1,4 @@
-package goserbench
+package avro
 
 import (
 	"bytes"
@@ -57,7 +57,7 @@ var avroSchemaJSON = `
 		}
 	`
 
-func NewAvroA() Serializer {
+func NewAvroA() goserbench.Serializer {
 	rec, err := goavro.NewRecord(goavro.RecordSchema(avroSchemaJSON))
 	if err != nil {
 		panic(err)
@@ -139,7 +139,7 @@ func avroUnmarshal(d []byte, o interface{}, unmarshalFunc func([]byte) (interfac
 	return nil
 }
 
-func NewAvro2Txt() Serializer {
+func NewAvro2Txt() goserbench.Serializer {
 	codec, err := goavro2.NewCodec(avroSchemaJSON)
 	if err != nil {
 		panic(err)
@@ -159,7 +159,7 @@ func (a *Avro2Txt) String() string {
 	return "GoAvro2Text"
 }
 
-func NewAvro2Bin() Serializer {
+func NewAvro2Bin() goserbench.Serializer {
 	codec, err := goavro2.NewCodec(avroSchemaJSON)
 	if err != nil {
 		panic(err)

baseline.go → internal/serializers/baseline/baseline.go

@@ -1,4 +1,4 @@
-package goserbench
+package baseline
 
 import (
 	"encoding/binary"
@@ -61,6 +61,6 @@ func (b *BaselineSerializer) Unmarshal(d []byte, o interface{}) error {
 	return nil
 }
 
-func NewBaselineSerializer() Serializer {
+func NewBaselineSerializer() goserbench.Serializer {
 	return &BaselineSerializer{b: make([]byte, 47)}
 }

bebop_200sc.go → internal/serializers/bebop_200sc/bebop_200sc.go

@@ -1,4 +1,4 @@
-package goserbench
+package bebop200sc
 
 import (
 	"time"
@@ -49,6 +49,6 @@ func (s *Bebop200ScSerializer) ForceUTC() bool {
 	return true
 }
 
-func NewBebop200ScSerializer() Serializer {
+func NewBebop200ScSerializer() goserbench.Serializer {
 	return &Bebop200ScSerializer{buf: make([]byte, 1024)}
 }

bebop_wellquite.go → internal/serializers/bebop_wellquite/bebop_wellquite.go

@@ -1,4 +1,4 @@
-package goserbench
+package bebopwellquite
 
 import (
 	"time"
@@ -44,7 +44,7 @@ func (s *BebopWellquiteSerializer) TimePrecision() time.Duration {
 	return 100 * time.Nanosecond
 }
 
-func NewBebopWellquiteSerializer() Serializer {
+func NewBebopWellquiteSerializer() goserbench.Serializer {
 	return &BebopWellquiteSerializer{
 		buf: make([]byte, 1024),
 	}

benc.go → internal/serializers/benc/benc.go

@@ -1,4 +1,4 @@
-package goserbench
+package benc
 
 import (
 	"time"
@@ -61,7 +61,7 @@ func (s BENCSerializer) Unmarshal(bs []byte, o interface{}) (err error) {
 	return
 }
 
-func NewBENCSerializer() Serializer {
+func NewBENCSerializer() goserbench.Serializer {
 	return BENCSerializer{}
 }
 
@@ -118,6 +118,6 @@ func (s BENCUnsafeSerializer) Unmarshal(bs []byte, o interface{}) (err error) {
 	return
 }
 
-func NewBENCUnsafeSerializer() Serializer {
+func NewBENCUnsafeSerializer() goserbench.Serializer {
 	return BENCUnsafeSerializer{}
 }

binary_alecthomas.go → internal/serializers/binary_alecthomas/binary_alecthomas.go

@@ -1,6 +1,9 @@
-package goserbench
+package binaryalecthomas
 
-import "github.com/alecthomas/binary"
+import (
+	"github.com/alecthomas/binary"
+	"github.com/alecthomas/go_serialization_benchmarks/goserbench"
+)
 
 type BinarySerializer struct{}
 
@@ -12,6 +15,6 @@ func (b BinarySerializer) Unmarshal(d []byte, o interface{}) error {
 	return binary.Unmarshal(d, o)
 }
 
-func NewBinarySerializer() Serializer {
+func NewBinarySerializer() goserbench.Serializer {
 	return BinarySerializer{}
 }

bson.go → internal/serializers/bson/bson.go

@@ -1,8 +1,9 @@
-package goserbench
+package bson
 
 import (
 	"time"
 
+	"github.com/alecthomas/go_serialization_benchmarks/goserbench"
 	"gopkg.in/mgo.v2/bson"
 )
 
@@ -20,6 +21,6 @@ func (m BsonSerializer) Unmarshal(d []byte, o interface{}) error {
 	return bson.Unmarshal(d, o)
 }
 
-func NewBsonSerializer() Serializer {
+func NewBsonSerializer() goserbench.Serializer {
 	return BsonSerializer{}
 }

capnproto.go → internal/serializers/capnproto/capnproto.go

@@ -1,4 +1,4 @@
-package goserbench
+package capnproto
 
 import (
 	"bytes"
@@ -41,6 +41,6 @@ func (x CapNProtoSerializer) Unmarshal(d []byte, i interface{}) error {
 	return nil
 }
 
-func NewCapNProtoSerializer() Serializer {
+func NewCapNProtoSerializer() goserbench.Serializer {
 	return CapNProtoSerializer{}
 }

structdef.capnp → internal/serializers/capnproto/structdef.capnp

@@ -1,6 +1,6 @@
 using Go = import "/github.com/glycerine/go-capnproto/go.capnp";
-$Go.package("goserbench");
-$Go.import("github.com/alecthomas/go_serialization_benchmarks");
+$Go.package("capnproto");
+$Go.import("github.com/alecthomas/go_serialization_benchmarks/internal/capnproto");
 
 @0x99ea7c74456111bd;
 

structdef.capnp.go → internal/serializers/capnproto/structdef.capnp.go

@@ -1,4 +1,4 @@
-package goserbench
+package capnproto
 
 // AUTO GENERATED - DO NOT EDIT
 

colfer.go → internal/serializers/colfer/colfer.go

@@ -1,4 +1,4 @@
-package goserbench
+package colfer
 
 import "github.com/alecthomas/go_serialization_benchmarks/goserbench"
 
@@ -43,6 +43,6 @@ func (s *ColferSerializer) Unmarshal(bs []byte, o interface{}) (err error) {
 	return
 }
 
-func NewColferSerializer() Serializer {
+func NewColferSerializer() goserbench.Serializer {
 	return &ColferSerializer{}
 }

easyjson.go → internal/serializers/easyjson/easyjson.go

@@ -1,4 +1,4 @@
-package goserbench
+package easyjson
 
 import (
 	"github.com/alecthomas/go_serialization_benchmarks/goserbench"
@@ -38,6 +38,6 @@ func (m EasyJSONSerializer) Unmarshal(d []byte, o interface{}) error {
 	return nil
 }
 
-func NewEasyJSONSerializer() Serializer {
+func NewEasyJSONSerializer() goserbench.Serializer {
 	return EasyJSONSerializer{}
 }

structdef.go → internal/serializers/easyjson/structdef.go

@@ -1,9 +1,12 @@
-package goserbench
+package easyjson
 
 import (
 	"time"
 )
 
+// This is a copy of the goserbench.SmallStruct because easyjson code generation
+// adds methods to it.
+
 //easyjson:json
 type A struct {
 	Name     string

fastjson.go → internal/serializers/fastjson/fastjson.go

@@ -1,4 +1,4 @@
-package goserbench
+package fastjson
 
 import (
 	"time"
@@ -46,7 +46,7 @@ func (s *FastJSONSerializer) Unmarshal(bs []byte, o interface{}) (err error) {
 	return nil
 }
 
-func NewFastJSONSerializer() Serializer {
+func NewFastJSONSerializer() goserbench.Serializer {
 	var arena fastjson.Arena
 	return &FastJSONSerializer{
 		object: arena.NewObject(),

flatbuffers.go → internal/serializers/flatbuffers/flatbuffers.go

@@ -1,4 +1,4 @@
-package goserbench
+package flatbuffers
 
 import (
 	"time"
@@ -44,6 +44,6 @@ func (s *FlatBufferSerializer) Unmarshal(d []byte, i interface{}) error {
 	return nil
 }
 
-func NewFlatBuffersSerializer() Serializer {
+func NewFlatBuffersSerializer() goserbench.Serializer {
 	return &FlatBufferSerializer{flatbuffers.NewBuilder(0)}
 }

gencode-unsafe.schema.gen.go → internal/serializers/gencode/gencode-unsafe.schema.gen.go

@@ -1,4 +1,4 @@
-package goserbench
+package gencode
 
 import (
 	"io"

gencode.go → internal/serializers/gencode/gencode.go

@@ -1,4 +1,4 @@
-package goserbench
+package gencode
 
 import (
 	"time"
@@ -40,7 +40,7 @@ func (s *GencodeSerializer) Unmarshal(bs []byte, o interface{}) (err error) {
 	return
 }
 
-func NewGencodeSerializer() Serializer {
+func NewGencodeSerializer() goserbench.Serializer {
 	return &GencodeSerializer{buf: make([]byte, 0, 1024)}
 }
 
@@ -78,6 +78,6 @@ func (s *GencodeUnsafeSerializer) Unmarshal(bs []byte, o interface{}) (err error
 	return
 }
 
-func NewGencodeUnsafeSerializer() Serializer {
+func NewGencodeUnsafeSerializer() goserbench.Serializer {
 	return &GencodeUnsafeSerializer{buf: make([]byte, 0, 1024)}
 }

gencode.schema.gen.go → internal/serializers/gencode/gencode.schema.gen.go

@@ -1,4 +1,4 @@
-package goserbench
+package gencode
 
 import (
 	"io"

gogoprotobuf.go → internal/serializers/gogo/gogoprotobuf.go

@@ -1,4 +1,4 @@
-package goserbench
+package gogo
 
 import (
 	"bytes"
@@ -51,14 +51,14 @@ func (s *GogoProtoSerializer) Unmarshal(bs []byte, o interface{}) (err error) {
 	return
 }
 
-func NewGogoProtoSerializer() Serializer {
+func NewGogoProtoSerializer() goserbench.Serializer {
 	return &GogoProtoSerializer{
 		marshaller:   proto.Marshal,
 		unmarshaller: proto.Unmarshal,
 	}
 }
 
-func NewGogoJsonSerializer() Serializer {
+func NewGogoJsonSerializer() goserbench.Serializer {
 	marshaller := &jsonpb.Marshaler{}
 	buf := bytes.NewBuffer(make([]byte, 0, 1024))
 

structdef-gogo.proto → internal/serializers/gogo/structdef-gogo.proto

@@ -2,7 +2,7 @@ syntax = "proto2";
 
 package goserbench;
 
-option go_package = "github.com/alecthomas/go_serialization_benchmarks;goserbench";
+option go_package = "github.com/alecthomas/go_serialization_benchmarks/internal/gogo;gogo";
 
 import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 

gotiny.go → internal/serializers/gotiny/gotiny.go

@@ -1,8 +1,9 @@
-package goserbench
+package gotiny
 
 import (
 	reflect "reflect"
 
+	"github.com/alecthomas/go_serialization_benchmarks/goserbench"
 	"github.com/cybriq/gotiny"
 )
 
@@ -19,8 +20,8 @@ func (g GotinySerializer) Unmarshal(d []byte, o interface{}) error {
 	return nil
 }
 
-func NewGotinySerializer() Serializer {
-	ot := reflect.TypeOf(A{})
+func NewGotinySerializer() goserbench.Serializer {
+	ot := reflect.TypeOf(goserbench.SmallStruct{})
 	return GotinySerializer{
 		dec: gotiny.NewDecoderWithType(ot),
 	}

hprose.go → internal/serializers/hprose/hprose.go

@@ -1,4 +1,4 @@
-package goserbench
+package hprose
 
 import (
 	"bytes"
@@ -54,7 +54,7 @@ func (s *HproseSerializer) Unmarshal(d []byte, i interface{}) (err error) {
 	return err
 }
 
-func NewHproseSerializer() Serializer {
+func NewHproseSerializer() goserbench.Serializer {
 	buf := new(bytes.Buffer)
 	reader := hprose.NewReader(buf, true)
 	bufw := new(bytes.Buffer)