From 8b2f92253d67af5ee8ba1731c214f9458ca1f08e Mon Sep 17 00:00:00 2001 From: Anton Date: Sat, 4 Nov 2017 21:24:12 +0300 Subject: [PATCH 1/2] fix problem with installation on 32-bit system --- benchmark/data.go | 4 ++-- tests/data.go | 30 +++++++++++++++--------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/benchmark/data.go b/benchmark/data.go index d2c689c..71eb91a 100644 --- a/benchmark/data.go +++ b/benchmark/data.go @@ -25,12 +25,12 @@ var smallStructData = Entities{ type SearchMetadata struct { CompletedIn float64 `json:"completed_in"` Count int `json:"count"` - MaxID int `json:"max_id"` + MaxID int64 `json:"max_id"` MaxIDStr string `json:"max_id_str"` NextResults string `json:"next_results"` Query string `json:"query"` RefreshURL string `json:"refresh_url"` - SinceID int `json:"since_id"` + SinceID int64 `json:"since_id"` SinceIDStr string `json:"since_id_str"` } diff --git a/tests/data.go b/tests/data.go index 234e578..b45ad73 100644 --- a/tests/data.go +++ b/tests/data.go @@ -89,10 +89,10 @@ var primitiveTypesString = "{" + `"Int32":` + fmt.Sprint(math.MinInt32) + `,` + `"Int64":` + fmt.Sprint(int64(math.MinInt64)) + `,` + - `"Uint":` + fmt.Sprint(math.MaxUint32) + `,` + + `"Uint":` + fmt.Sprint(uint32(math.MaxUint32)) + `,` + `"Uint8":` + fmt.Sprint(math.MaxUint8) + `,` + `"Uint16":` + fmt.Sprint(math.MaxUint16) + `,` + - `"Uint32":` + fmt.Sprint(math.MaxUint32) + `,` + + `"Uint32":` + fmt.Sprint(uint32(math.MaxUint32)) + `,` + `"Uint64":` + fmt.Sprint(uint64(math.MaxUint64)) + `,` + `"IntString":"` + fmt.Sprint(math.MinInt32) + `",` + @@ -101,10 +101,10 @@ var primitiveTypesString = "{" + `"Int32String":"` + fmt.Sprint(math.MinInt32) + `",` + `"Int64String":"` + fmt.Sprint(int64(math.MinInt64)) + `",` + - `"UintString":"` + fmt.Sprint(math.MaxUint32) + `",` + + `"UintString":"` + fmt.Sprint(uint32(math.MaxUint32)) + `",` + `"Uint8String":"` + fmt.Sprint(math.MaxUint8) + `",` + `"Uint16String":"` + fmt.Sprint(math.MaxUint16) + `",` + - `"Uint32String":"` + fmt.Sprint(math.MaxUint32) + `",` + + `"Uint32String":"` + fmt.Sprint(uint32(math.MaxUint32)) + `",` + `"Uint64String":"` + fmt.Sprint(uint64(math.MaxUint64)) + `",` + `"Float32":` + fmt.Sprint(1.5) + `,` + @@ -192,10 +192,10 @@ var namedPrimitiveTypesString = "{" + `"Int32":` + fmt.Sprint(math.MinInt32) + `,` + `"Int64":` + fmt.Sprint(int64(math.MinInt64)) + `,` + - `"Uint":` + fmt.Sprint(math.MaxUint32) + `,` + + `"Uint":` + fmt.Sprint(uint32(math.MaxUint32)) + `,` + `"Uint8":` + fmt.Sprint(math.MaxUint8) + `,` + `"Uint16":` + fmt.Sprint(math.MaxUint16) + `,` + - `"Uint32":` + fmt.Sprint(math.MaxUint32) + `,` + + `"Uint32":` + fmt.Sprint(uint32(math.MaxUint32)) + `,` + `"Uint64":` + fmt.Sprint(uint64(math.MaxUint64)) + `,` + `"Float32":` + fmt.Sprint(1.5) + `,` + @@ -570,7 +570,7 @@ type DeepNest struct { var deepNestValue = DeepNest{ SliceMap: map[Str][]Str{ - "testSliceMap": []Str{ + "testSliceMap": { "0", "1", }, @@ -579,39 +579,39 @@ var deepNestValue = DeepNest{ "testSliceMap1": []Str(nil), }, SliceMap2: map[Str][]Str{ - "testSliceMap2": []Str{}, + "testSliceMap2": {}, }, NamedSliceMap: map[Str]NamedSlice{ - "testNamedSliceMap": NamedSlice{ + "testNamedSliceMap": { "2", "3", }, }, NamedMapMap: map[Str]NamedMap{ - "testNamedMapMap": NamedMap{ + "testNamedMapMap": { "key1": "value1", }, }, MapSlice: []map[Str]Str{ - map[Str]Str{ + { "testMapSlice": "someValue", }, }, NamedSliceSlice: []NamedSlice{ - NamedSlice{ + { "someValue1", "someValue2", }, - NamedSlice{ + { "someValue3", "someValue4", }, }, NamedMapSlice: []NamedMap{ - NamedMap{ + { "key2": "value2", }, - NamedMap{ + { "key3": "value3", }, }, From a2a98adabc72c7e0536426ed116e16d04f018b73 Mon Sep 17 00:00:00 2001 From: Kwisatz Date: Sat, 4 Nov 2017 22:01:21 +0300 Subject: [PATCH 2/2] fix problem with installation on 32-bit system --- tests/data.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/data.go b/tests/data.go index b45ad73..145f093 100644 --- a/tests/data.go +++ b/tests/data.go @@ -570,7 +570,7 @@ type DeepNest struct { var deepNestValue = DeepNest{ SliceMap: map[Str][]Str{ - "testSliceMap": { + "testSliceMap": []Str{ "0", "1", }, @@ -579,39 +579,39 @@ var deepNestValue = DeepNest{ "testSliceMap1": []Str(nil), }, SliceMap2: map[Str][]Str{ - "testSliceMap2": {}, + "testSliceMap2": []Str{}, }, NamedSliceMap: map[Str]NamedSlice{ - "testNamedSliceMap": { + "testNamedSliceMap": NamedSlice{ "2", "3", }, }, NamedMapMap: map[Str]NamedMap{ - "testNamedMapMap": { + "testNamedMapMap": NamedMap{ "key1": "value1", }, }, MapSlice: []map[Str]Str{ - { + map[Str]Str{ "testMapSlice": "someValue", }, }, NamedSliceSlice: []NamedSlice{ - { + NamedSlice{ "someValue1", "someValue2", }, - { + NamedSlice{ "someValue3", "someValue4", }, }, NamedMapSlice: []NamedMap{ - { + NamedMap{ "key2": "value2", }, - { + NamedMap{ "key3": "value3", }, },