Skip to content

Commit e439780

Browse files
WillAbidesWillAbides
authored
Merge pull request #48 from WillAbides/actionupdate
update
2 parents 400fc55 + fa23ad7 commit e439780

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+777
-403
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ on: [ push, workflow_dispatch ]
33
jobs:
44
cibuild:
55
name: cibuild
6-
runs-on: ubuntu-18.04
6+
runs-on: ubuntu-22.04
77
steps:
88
- uses: actions/checkout@v2
99
- uses: WillAbides/setup-go-faster@v1
1010
id: setup-go
1111
with:
12-
go-version: '1.17'
13-
- uses: actions/cache@v2
12+
go-version: '1.25'
13+
- uses: actions/cache@v3
1414
with:
1515
path: |
1616
${{ steps.setup-go.outputs.GOCACHE }}
@@ -23,15 +23,15 @@ jobs:
2323
benchdiff:
2424
if: ${{ ! startsWith(github.ref, 'refs/tags/') }}
2525
name: benchdiff
26-
runs-on: ubuntu-18.04
26+
runs-on: ubuntu-22.04
2727
steps:
2828
- uses: actions/checkout@v2
2929
with:
3030
fetch-depth: 0
3131
- uses: WillAbides/setup-go-faster@v1
3232
id: setup-go
3333
with:
34-
go-version: '1.17'
34+
go-version: '1.25'
3535
- uses: WillAbides/benchdiff-action@v0.3.3
3636
id: benchdiff
3737
with:

‎.github/workflows/fuzz.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ on:
66
jobs:
77
fuzz:
88
name: fuzz
9-
runs-on: ubuntu-18.04
9+
runs-on: ubuntu-22.04
1010
steps:
1111
- uses: actions/checkout@v2
1212
with:
1313
fetch-depth: 0
1414
- uses: WillAbides/setup-go-faster@v1
1515
id: setup-go
1616
with:
17-
go-version: '1.17'
18-
- uses: actions/cache@v2
17+
go-version: '1.25'
18+
- uses: actions/cache@v3
1919
with:
2020
path: |
2121
${{ steps.setup-go.outputs.GOCACHE }}

‎.golangci.yaml‎

Lines changed: 371 additions & 0 deletions
Large diffs are not rendered by default.

‎.golangci.yml‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎Makefile‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,28 +16,11 @@ bin/gobin:
1616
bin/mockgen:
1717
script/bindown install $(notdir $@)
1818

19-
bin/jq:
20-
script/bindown install $(notdir $@)
21-
22-
HANDCRAFTED_REV := 082e94edadf89c33db0afb48889c8419a2cb46a9
23-
bin/handcrafted: bin/gobin
24-
GOBIN=${CURDIR}/bin \
25-
bin/gobin github.com/willabides/handcrafted@$(HANDCRAFTED_REV)
26-
2719
GOFUMPT_REV := v0.1.0
2820
bin/gofumpt: bin/gobin
2921
GOBIN=${CURDIR}/bin \
3022
bin/gobin mvdan.cc/gofumpt@$(GOFUMPT_REV)
3123

32-
GO_FUZZ_REV := b1f3d6f4ef4e0fab65fa66f9191e6b115ad34f31
33-
bin/go-fuzz-build: bin/gobin
34-
GOBIN=${CURDIR}/bin \
35-
go install github.com/dvyukov/go-fuzz/go-fuzz-build@$(GO_FUZZ_REV)
36-
37-
bin/go-fuzz: bin/gobin
38-
GOBIN=${CURDIR}/bin \
39-
go install github.com/dvyukov/go-fuzz/go-fuzz@$(GO_FUZZ_REV)
40-
4124
BENCHSTAT_REV := 40a54f11e90963acb1c431127af77c095654c32d
4225
bin/benchstat:
4326
GOBIN=${CURDIR}/bin \

‎bench_test.go‎

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ var (
1414
benchBool bool
1515
benchBuf Buffer
1616
benchFloat float64
17-
benchFace interface{}
17+
benchFace any
1818
)
1919

2020
func BenchmarkSkip(b *testing.B) {
@@ -27,7 +27,7 @@ func BenchmarkSkip(b *testing.B) {
2727
b.ReportAllocs()
2828
b.SetBytes(size)
2929
var err error
30-
for i := 0; i < b.N; i++ {
30+
for b.Loop() {
3131
benchInt, err = SkipValue(data, &benchBuf)
3232
}
3333
require.NoError(b, err)
@@ -37,7 +37,7 @@ func BenchmarkSkip(b *testing.B) {
3737
b.ReportAllocs()
3838
b.SetBytes(size)
3939
var err error
40-
for i := 0; i < b.N; i++ {
40+
for b.Loop() {
4141
benchInt, err = SkipValueFast(data, &benchBuf)
4242
}
4343
require.NoError(b, err)
@@ -53,7 +53,7 @@ func BenchmarkValid(b *testing.B) {
5353
b.Run(file, func(b *testing.B) {
5454
b.ReportAllocs()
5555
b.SetBytes(size)
56-
for i := 0; i < b.N; i++ {
56+
for b.Loop() {
5757
benchBool = Valid(data, &benchBuf)
5858
}
5959
require.True(b, benchBool)
@@ -70,7 +70,7 @@ func BenchmarkReadObject(b *testing.B) {
7070
b.ReportAllocs()
7171
b.SetBytes(size)
7272
h := &ValueReader{}
73-
for i := 0; i < b.N; i++ {
73+
for b.Loop() {
7474
benchFace, _, err = h.ReadValue(data)
7575
}
7676
require.NoError(b, err)
@@ -119,7 +119,7 @@ func BenchmarkGetValuesFromObject(b *testing.B) {
119119
return p, err
120120
})
121121
b.ReportAllocs()
122-
for i := 0; i < b.N; i++ {
122+
for b.Loop() {
123123
seenGists, seenGists, seenLogin = false, false, false
124124
_, err = HandleObjectValues(data, handler, buffer)
125125
}
@@ -137,7 +137,7 @@ func BenchmarkReadFloat64(b *testing.B) {
137137
var err error
138138
b.ReportAllocs()
139139
benchLoop:
140-
for i := 0; i < b.N; i++ {
140+
for b.Loop() {
141141
for _, data := range datas {
142142
benchFloat, _, err = ReadFloat64(data)
143143
if err != nil {
@@ -160,7 +160,7 @@ func BenchmarkDecodeFloat64(b *testing.B) {
160160
var err error
161161
b.ReportAllocs()
162162
benchLoop:
163-
for i := 0; i < b.N; i++ {
163+
for b.Loop() {
164164
for _, data := range datas {
165165
benchInt, err = DecodeFloat64(data, &benchFloat)
166166
if err != nil {
@@ -181,7 +181,7 @@ func BenchmarkReadInt64(b *testing.B) {
181181
var err error
182182
b.ReportAllocs()
183183
benchLoop:
184-
for i := 0; i < b.N; i++ {
184+
for b.Loop() {
185185
for _, data := range datas {
186186
benchInt64, _, err = ReadInt64(data)
187187
if err != nil {
@@ -200,7 +200,7 @@ func BenchmarkDecodeInt64(b *testing.B) {
200200
var err error
201201
b.ReportAllocs()
202202
benchLoop:
203-
for i := 0; i < b.N; i++ {
203+
for b.Loop() {
204204
for _, data := range datas {
205205
benchInt, err = DecodeInt64(data, &benchInt64)
206206
if err != nil {
@@ -212,14 +212,16 @@ benchLoop:
212212

213213
func BenchmarkReadString(b *testing.B) {
214214
simpleString := []byte(`"hello this is a string of somewhat normal length"`)
215-
complexString := []byte(`"@aym0566x \n\n名前:前田あゆみ\n第一印象:なんか怖っ！\n今の印象:とりあえずキモい。噛み合わない\n好きなところ:ぶすでキモいとこ😋✨✨\n思い出:んーーー、ありすぎ😊❤️\nLINE交換できる？:あぁ……ごめん✋\nトプ画をみて:照れますがな😘✨\n一言:お前は一生もんのダチ💖"`)
215+
complexString := []byte(
216+
`"@aym0566x \n\n名前:前田あゆみ\n第一印象:なんか怖っ！\n今の印象:とりあえずキモい。噛み合わない\n好きなところ:ぶすでキモいとこ😋✨✨\n思い出:んーーー、ありすぎ😊❤️\nLINE交換できる？:あぁ……ごめん✋\nトプ画をみて:照れますがな😘✨\n一言:お前は一生もんのダチ💖"`,
217+
)
216218
var err error
217219

218220
b.Run("simple string", func(b *testing.B) {
219221
b.Run("nil buf", func(b *testing.B) {
220222
b.ReportAllocs()
221223
b.SetBytes(int64(len(simpleString)))
222-
for i := 0; i < b.N; i++ {
224+
for b.Loop() {
223225
benchString, benchInt, err = ReadString(simpleString, nil)
224226
}
225227
require.NoError(b, err)
@@ -229,7 +231,7 @@ func BenchmarkReadString(b *testing.B) {
229231
var buf []byte
230232
b.ReportAllocs()
231233
b.SetBytes(int64(len(simpleString)))
232-
for i := 0; i < b.N; i++ {
234+
for b.Loop() {
233235
benchString, benchInt, err = ReadString(simpleString, &buf)
234236
}
235237
require.NoError(b, err)
@@ -240,7 +242,7 @@ func BenchmarkReadString(b *testing.B) {
240242
b.Run("nil buf", func(b *testing.B) {
241243
b.ReportAllocs()
242244
b.SetBytes(int64(len(complexString)))
243-
for i := 0; i < b.N; i++ {
245+
for b.Loop() {
244246
benchString, benchInt, err = ReadString(complexString, nil)
245247
}
246248
require.NoError(b, err)
@@ -250,7 +252,7 @@ func BenchmarkReadString(b *testing.B) {
250252
var buf []byte
251253
b.ReportAllocs()
252254
b.SetBytes(int64(len(complexString)))
253-
for i := 0; i < b.N; i++ {
255+
for b.Loop() {
254256
benchString, benchInt, err = ReadString(complexString, &buf)
255257
}
256258
require.NoError(b, err)
@@ -259,25 +261,29 @@ func BenchmarkReadString(b *testing.B) {
259261
}
260262

261263
func BenchmarkDecodeString(b *testing.B) {
262-
data := []byte(`"@aym0566x \n\n名前:前田あゆみ\n第一印象:なんか怖っ！\n今の印象:とりあえずキモい。噛み合わない\n好きなところ:ぶすでキモいとこ😋✨✨\n思い出:んーーー、ありすぎ😊❤️\nLINE交換できる？:あぁ……ごめん✋\nトプ画をみて:照れますがな😘✨\n一言:お前は一生もんのダチ💖"`)
264+
data := []byte(
265+
`"@aym0566x \n\n名前:前田あゆみ\n第一印象:なんか怖っ！\n今の印象:とりあえずキモい。噛み合わない\n好きなところ:ぶすでキモいとこ😋✨✨\n思い出:んーーー、ありすぎ😊❤️\nLINE交換できる？:あぁ……ごめん✋\nトプ画をみて:照れますがな😘✨\n一言:お前は一生もんのダチ💖"`,
266+
)
263267
var err error
264268
b.ReportAllocs()
265269
b.SetBytes(int64(len(data)))
266270
var stringBuf []byte
267-
for i := 0; i < b.N; i++ {
271+
for b.Loop() {
268272
benchInt, err = DecodeString(data, &benchString, &stringBuf)
269273
}
270274
require.NoError(b, err)
271275
}
272276

273277
func BenchmarkReadStringBytes(b *testing.B) {
274-
data := []byte(`"@aym0566x \n\n名前:前田あゆみ\n第一印象:なんか怖っ！\n今の印象:とりあえずキモい。噛み合わない\n好きなところ:ぶすでキモいとこ😋✨✨\n思い出:んーーー、ありすぎ😊❤️\nLINE交換できる？:あぁ……ごめん✋\nトプ画をみて:照れますがな😘✨\n一言:お前は一生もんのダチ💖"`)
278+
data := []byte(
279+
`"@aym0566x \n\n名前:前田あゆみ\n第一印象:なんか怖っ！\n今の印象:とりあえずキモい。噛み合わない\n好きなところ:ぶすでキモいとこ😋✨✨\n思い出:んーーー、ありすぎ😊❤️\nLINE交換できる？:あぁ……ごめん✋\nトプ画をみて:照れますがな😘✨\n一言:お前は一生もんのダチ💖"`,
280+
)
275281
var buf []byte
276282
var err error
277283
b.ReportAllocs()
278284
b.SetBytes(int64(len(data)))
279285

280-
for i := 0; i < b.N; i++ {
286+
for b.Loop() {
281287
buf, benchInt, err = ReadStringBytes(data, buf[:0])
282288
}
283289
require.NoError(b, err)

0 commit comments

Comments
 (0)