Easyjson test should not interfere with json test

Tests generated standard JSON marshaler/unmarshaler interfaces for easyjson. These will have been picked up by the encoding/json code and thrown off the result for encoding/json.

Better for easyjson test to use its own specific (un)marshaling interfaces only, which easyjson claim are better than the standard ones

Makefile

@@ -18,7 +18,7 @@ msgp_gen.go: structdef.go
 	go run github.com/tinylib/msgp -o msgp_gen.go -file structdef.go -io=false -tests=false
 
 structdef_easyjson.go: structdef.go
-	go run github.com/mailru/easyjson/easyjson -all structdef.go
+	go run github.com/mailru/easyjson/easyjson -no_std_marshalers -all structdef.go
 
 structdef-gogo.pb.go: structdef-gogo.proto
 	protoc --gogofaster_out=. -I. -I${GOPATH}/src  -I${GOPATH}/src/github.com/gogo/protobuf/protobuf structdef-gogo.proto

serialization_benchmarks_test.go

@@ -22,6 +22,7 @@ import (
 	hprose2 "github.com/hprose/hprose-golang/io"
 	ikea "github.com/ikkerens/ikeapack"
 	jsoniter "github.com/json-iterator/go"
+	easyjson "github.com/mailru/easyjson"
 	"github.com/niubaoshu/gotiny"
 	ssz "github.com/prysmaticlabs/go-ssz"
 	shamaton "github.com/shamaton/msgpack"
@@ -339,11 +340,11 @@ func BenchmarkJsonIterUnmarshal(b *testing.B) {
 type EasyJSONSerializer struct{}
 
 func (m EasyJSONSerializer) Marshal(o interface{}) ([]byte, error) {
-	return o.(*A).MarshalJSON()
+	return easyjson.Marshal(o.(easyjson.Marshaler))
 }
 
 func (m EasyJSONSerializer) Unmarshal(d []byte, o interface{}) error {
-	return o.(*A).UnmarshalJSON(d)
+	return easyjson.Unmarshal(d, o.(*A))
 }
 
 func BenchmarkEasyJsonMarshal(b *testing.B) {