1
0
mirror of https://github.com/json-iterator/go.git synced 2025-04-14 11:18:49 +02:00

fix go vet

This commit is contained in:
Tao Wen 2017-07-09 11:24:26 +08:00
parent 6d0e6f3733
commit 9ecb1fd36d
6 changed files with 17 additions and 16 deletions

View File

@ -44,7 +44,7 @@ func ExampleUnmarshal() {
// [{Name:Platypus Order:Monotremata} {Name:Quoll Order:Dasyuromorphia}] // [{Name:Platypus Order:Monotremata} {Name:Quoll Order:Dasyuromorphia}]
} }
func ExampleMarshalWithBestPerformance() { func ExampleConfigFastest_Marshal() {
type ColorGroup struct { type ColorGroup struct {
ID int ID int
Name string Name string
@ -66,7 +66,7 @@ func ExampleMarshalWithBestPerformance() {
// {"ID":1,"Name":"Reds","Colors":["Crimson","Red","Ruby","Maroon"]} // {"ID":1,"Name":"Reds","Colors":["Crimson","Red","Ruby","Maroon"]}
} }
func ExampleUnmarshalWithBestPerformance() { func ExampleConfigFastest_Unmarshal() {
var jsonBlob = []byte(`[ var jsonBlob = []byte(`[
{"Name": "Platypus", "Order": "Monotremata"}, {"Name": "Platypus", "Order": "Monotremata"},
{"Name": "Quoll", "Order": "Dasyuromorphia"} {"Name": "Quoll", "Order": "Dasyuromorphia"}
@ -87,7 +87,7 @@ func ExampleUnmarshalWithBestPerformance() {
// [{Name:Platypus Order:Monotremata} {Name:Quoll Order:Dasyuromorphia}] // [{Name:Platypus Order:Monotremata} {Name:Quoll Order:Dasyuromorphia}]
} }
func ExampleOneLine() { func ExampleGet() {
val := []byte(`{"ID":1,"Name":"Reds","Colors":["Crimson","Red","Ruby","Maroon"]}`) val := []byte(`{"ID":1,"Name":"Reds","Colors":["Crimson","Red","Ruby","Maroon"]}`)
fmt.Printf(Get(val, "Colors", 0).ToString()) fmt.Printf(Get(val, "Colors", 0).ToString())
// Output: // Output:

View File

@ -34,11 +34,11 @@ type arrayEncoder struct {
func (encoder *arrayEncoder) Encode(ptr unsafe.Pointer, stream *Stream) { func (encoder *arrayEncoder) Encode(ptr unsafe.Pointer, stream *Stream) {
stream.WriteArrayStart() stream.WriteArrayStart()
elemPtr := uintptr(ptr) elemPtr := unsafe.Pointer(ptr)
encoder.elemEncoder.Encode(unsafe.Pointer(elemPtr), stream) encoder.elemEncoder.Encode(elemPtr, stream)
for i := 1; i < encoder.arrayType.Len(); i++ { for i := 1; i < encoder.arrayType.Len(); i++ {
stream.WriteMore() stream.WriteMore()
elemPtr += encoder.elemType.Size() elemPtr = unsafe.Pointer(uintptr(elemPtr) + encoder.elemType.Size())
encoder.elemEncoder.Encode(unsafe.Pointer(elemPtr), stream) encoder.elemEncoder.Encode(unsafe.Pointer(elemPtr), stream)
} }
stream.WriteArrayEnd() stream.WriteArrayEnd()

View File

@ -136,7 +136,7 @@ func encodeMapKey(key reflect.Value, stream *Stream) {
stream.writeByte('"') stream.writeByte('"')
return return
} }
stream.Error = &json.UnsupportedTypeError{key.Type()} stream.Error = &json.UnsupportedTypeError{Type:key.Type()}
} }
func (encoder *mapEncoder) EncodeInterface(val interface{}, stream *Stream) { func (encoder *mapEncoder) EncodeInterface(val interface{}, stream *Stream) {
@ -216,7 +216,7 @@ func (w *reflectWithString) resolve() error {
w.s = strconv.FormatUint(w.v.Uint(), 10) w.s = strconv.FormatUint(w.v.Uint(), 10)
return nil return nil
} }
return &json.UnsupportedTypeError{w.v.Type()} return &json.UnsupportedTypeError{Type:w.v.Type()}
} }
func (sv stringValues) Len() int { return len(sv) } func (sv stringValues) Len() int { return len(sv) }

View File

@ -1015,8 +1015,8 @@ type structFieldDecoder struct {
} }
func (decoder *structFieldDecoder) Decode(ptr unsafe.Pointer, iter *Iterator) { func (decoder *structFieldDecoder) Decode(ptr unsafe.Pointer, iter *Iterator) {
fieldPtr := uintptr(ptr) + decoder.field.Offset fieldPtr := unsafe.Pointer(uintptr(ptr) + decoder.field.Offset)
decoder.fieldDecoder.Decode(unsafe.Pointer(fieldPtr), iter) decoder.fieldDecoder.Decode(fieldPtr, iter)
if iter.Error != nil && iter.Error != io.EOF { if iter.Error != nil && iter.Error != io.EOF {
iter.Error = fmt.Errorf("%s: %s", decoder.field.Name, iter.Error.Error()) iter.Error = fmt.Errorf("%s: %s", decoder.field.Name, iter.Error.Error())
} }
@ -1029,8 +1029,8 @@ type structFieldEncoder struct {
} }
func (encoder *structFieldEncoder) Encode(ptr unsafe.Pointer, stream *Stream) { func (encoder *structFieldEncoder) Encode(ptr unsafe.Pointer, stream *Stream) {
fieldPtr := uintptr(ptr) + encoder.field.Offset fieldPtr := unsafe.Pointer(uintptr(ptr) + encoder.field.Offset)
encoder.fieldEncoder.Encode(unsafe.Pointer(fieldPtr), stream) encoder.fieldEncoder.Encode(fieldPtr, stream)
if stream.Error != nil && stream.Error != io.EOF { if stream.Error != nil && stream.Error != io.EOF {
stream.Error = fmt.Errorf("%s: %s", encoder.field.Name, stream.Error.Error()) stream.Error = fmt.Errorf("%s: %s", encoder.field.Name, stream.Error.Error())
} }
@ -1041,8 +1041,8 @@ func (encoder *structFieldEncoder) EncodeInterface(val interface{}, stream *Stre
} }
func (encoder *structFieldEncoder) IsEmpty(ptr unsafe.Pointer) bool { func (encoder *structFieldEncoder) IsEmpty(ptr unsafe.Pointer) bool {
fieldPtr := uintptr(ptr) + encoder.field.Offset fieldPtr := unsafe.Pointer(uintptr(ptr) + encoder.field.Offset)
return encoder.fieldEncoder.IsEmpty(unsafe.Pointer(fieldPtr)) return encoder.fieldEncoder.IsEmpty(fieldPtr)
} }
type structEncoder struct { type structEncoder struct {

View File

@ -43,11 +43,11 @@ func (encoder *sliceEncoder) Encode(ptr unsafe.Pointer, stream *Stream) {
return return
} }
stream.WriteArrayStart() stream.WriteArrayStart()
elemPtr := uintptr(slice.Data) elemPtr := unsafe.Pointer(slice.Data)
encoder.elemEncoder.Encode(unsafe.Pointer(elemPtr), stream) encoder.elemEncoder.Encode(unsafe.Pointer(elemPtr), stream)
for i := 1; i < slice.Len; i++ { for i := 1; i < slice.Len; i++ {
stream.WriteMore() stream.WriteMore()
elemPtr += encoder.elemType.Size() elemPtr = unsafe.Pointer(uintptr(elemPtr) + encoder.elemType.Size())
encoder.elemEncoder.Encode(unsafe.Pointer(elemPtr), stream) encoder.elemEncoder.Encode(unsafe.Pointer(elemPtr), stream)
} }
stream.WriteArrayEnd() stream.WriteArrayEnd()

View File

@ -1,3 +1,4 @@
package test package test
// Only used in test
type T int8 type T int8