Skip to content

Commit 625cfcb

Browse files
fix: update Go version to 1.25.0 and remove toolchain directive (#151)
1 parent b6ada0f commit 625cfcb

File tree

9 files changed

+98
-122
lines changed

9 files changed

+98
-122
lines changed

.github/workflows/lint.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
with:
2222
go-version: 'stable'
2323
- name: golangci-lint
24-
uses: golangci/golangci-lint-action@v5
24+
uses: golangci/golangci-lint-action@v7
2525
with:
2626
version: latest
2727
github-token: ${{ secrets.GITHUB_TOKEN }}

.golangci.yaml

Lines changed: 88 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -1,116 +1,94 @@
1-
---
1+
version: "2"
22
linters:
33
enable:
4-
# check when errors are compared without errors.Is
4+
- dupword
55
- errorlint
6-
7-
# check imports order and makes it always deterministic.
8-
- gci
9-
10-
# Very Basic spell error checker
6+
- mirror
117
- misspell
12-
13-
# Fast, configurable, extensible, flexible, and beautiful linter for Go.
14-
# Drop-in replacement of golint.
15-
- revive
16-
17-
# make sure to use t.Helper() when needed
18-
- thelper
19-
20-
# ensure that lint exceptions have explanations. Consider the case below:
218
- nolintlint
22-
23-
# detect duplicated words in code
24-
- dupword
25-
26-
# mirror suggests rewrites to avoid unnecessary []byte/string conversion
27-
- mirror
28-
29-
# testify checks good usage of github.com/stretchr/testify.
9+
- revive
3010
- testifylint
31-
32-
linters-settings:
33-
dupword:
34-
# Keywords used to ignore detection.
35-
# Default: []
36-
ignore:
37-
- "FAIL" # "FAIL FAIL" is tolerated
38-
39-
nolintlint:
40-
# Disable to ensure that all nolint directives actually have an effect.
41-
# Default: false
42-
allow-unused: true # too many false positive reported
43-
# Exclude following linters from requiring an explanation.
44-
# Default: []
45-
allow-no-explanation: []
46-
# Enable to require an explanation of nonzero length
47-
# after each nolint directive.
48-
# Default: false
49-
require-explanation: true
50-
# Enable to require nolint directives to mention the specific
51-
# linter being suppressed.
52-
# Default: false
53-
require-specific: true
54-
55-
revive:
56-
rules:
57-
- name: bare-return
58-
- name: blank-imports
59-
- name: comment-spacings
60-
- name: context-as-argument
61-
arguments:
62-
- allowTypesBefore: "*testing.T"
63-
- name: context-keys-type
64-
- name: defer
65-
arguments:
66-
- ["call-chain", "loop"]
67-
- name: dot-imports
68-
- name: early-return
69-
- name: empty-block
70-
- name: error-return
71-
- name: error-strings
72-
- name: error-naming
73-
- name: errorf
74-
- name: exported
75-
arguments:
76-
# enables checking public methods of private types
77-
- "checkPrivateReceivers"
78-
# make error messages clearer
79-
- "sayRepetitiveInsteadOfStutters"
80-
- name: if-return
81-
- name: import-shadowing
82-
- name: increment-decrement
83-
- name: indent-error-flow
84-
- name: exported
85-
- name: var-naming
86-
- name: var-declaration
87-
- name: package-comments
88-
- name: range
89-
- name: receiver-naming
90-
- name: redefines-builtin-id
91-
- name: superfluous-else
92-
- name: time-naming
93-
- name: time-equal
94-
- name: unexported-return
95-
- name: use-any
96-
- name: unreachable-code
97-
- name: unhandled-error
98-
arguments:
99-
- "fmt.Print.*"
100-
- "fmt.Fprint.*"
101-
- "bytes.Buffer.Write.*"
102-
- "strings.Builder.Write.*"
103-
- name: unused-parameter
104-
- name: unused-receiver
105-
- name: useless-break
106-
107-
# define the import orders
108-
gci:
109-
sections:
110-
# Standard section: captures all standard packages.
111-
- standard
112-
# Default section: catchall that is not standard or custom
113-
- default
114-
# Custom section: groups all imports with the specified Prefix.
115-
- prefix(github.com/mfridman)
116-
11+
- thelper
12+
settings:
13+
dupword:
14+
ignore:
15+
- FAIL
16+
nolintlint:
17+
require-explanation: true
18+
require-specific: true
19+
allow-unused: true
20+
revive:
21+
rules:
22+
- name: bare-return
23+
- name: blank-imports
24+
- name: comment-spacings
25+
- name: context-as-argument
26+
arguments:
27+
- allowTypesBefore: '*testing.T'
28+
- name: context-keys-type
29+
- name: defer
30+
arguments:
31+
- - call-chain
32+
- loop
33+
- name: dot-imports
34+
- name: early-return
35+
- name: empty-block
36+
- name: error-return
37+
- name: error-strings
38+
- name: error-naming
39+
- name: errorf
40+
- name: exported
41+
arguments:
42+
- checkPrivateReceivers
43+
- sayRepetitiveInsteadOfStutters
44+
- name: if-return
45+
- name: import-shadowing
46+
- name: increment-decrement
47+
- name: indent-error-flow
48+
- name: exported
49+
- name: var-declaration
50+
- name: package-comments
51+
- name: range
52+
- name: receiver-naming
53+
- name: redefines-builtin-id
54+
- name: superfluous-else
55+
- name: time-naming
56+
- name: time-equal
57+
- name: unexported-return
58+
- name: use-any
59+
- name: unreachable-code
60+
- name: unhandled-error
61+
arguments:
62+
- fmt.Print.*
63+
- fmt.Fprint.*
64+
- bytes.Buffer.Write.*
65+
- strings.Builder.Write.*
66+
- name: unused-parameter
67+
- name: unused-receiver
68+
- name: useless-break
69+
exclusions:
70+
generated: lax
71+
presets:
72+
- comments
73+
- common-false-positives
74+
- legacy
75+
- std-error-handling
76+
paths:
77+
- third_party$
78+
- builtin$
79+
- examples$
80+
formatters:
81+
enable:
82+
- gci
83+
settings:
84+
gci:
85+
sections:
86+
- standard
87+
- default
88+
- prefix(github.com/mfridman)
89+
exclusions:
90+
generated: lax
91+
paths:
92+
- third_party$
93+
- builtin$
94+
- examples$

go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/mfridman/tparse
22

3-
go 1.23.0
4-
5-
toolchain go1.24.2
3+
go 1.25.0
64

75
require (
86
github.com/charmbracelet/lipgloss v1.1.0

tests/cached_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func TestPackageCache(t *testing.T) {
6262

6363
summary, err := parse.Process(f)
6464
require.NoError(t, err)
65-
assert.Equal(t, len(summary.Packages), len(tc.expected))
65+
assert.Len(t, summary.Packages, len(tc.expected))
6666

6767
for name, pkg := range summary.Packages {
6868
t.Run(name, func(t *testing.T) {

tests/cover_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func Test(t *testing.T) {
6565

6666
summary, err := parse.Process(f)
6767
require.NoError(t, err)
68-
assert.Equal(t, len(summary.Packages), len(tc.expected))
68+
assert.Len(t, summary.Packages, len(tc.expected))
6969

7070
for name, pkg := range summary.Packages {
7171
t.Run(name, func(t *testing.T) {

tests/outcome_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func TestFinalOutcome(t *testing.T) {
6262
}
6363
summary, err := parse.Process(f)
6464
require.NoError(t, err)
65-
assert.Equal(t, len(summary.Packages), len(tc.registry))
65+
assert.Len(t, summary.Packages, len(tc.registry))
6666
assert.Equal(t, summary.ExitCode(), tc.exitCode)
6767

6868
for name, pkg := range summary.Packages {

tests/package_start_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func TestPackageStartTime(t *testing.T) {
3737

3838
summary, err := parse.Process(f)
3939
require.NoError(t, err)
40-
assert.Equal(t, len(summary.Packages), len(expected))
40+
assert.Len(t, summary.Packages, len(expected))
4141

4242
for _, p := range summary.Packages {
4343
if p.StartTime.IsZero() {

tests/race_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func TestRaceDetected(t *testing.T) {
7373
if !ok {
7474
t.Fatalf("failed to find package: %q", name)
7575
}
76-
assert.Equal(t, len(pkg.DataRaceTests), len(wantTestName))
76+
assert.Len(t, pkg.DataRaceTests, len(wantTestName))
7777
if len(pkg.DataRaceTests) > 0 {
7878
for i := range pkg.DataRaceTests {
7979
assert.Equal(t, pkg.DataRaceTests[i], wantTestName[i])

tests/sort_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func TestSortName(t *testing.T) {
5858

5959
summary, err := parse.Process(f)
6060
require.NoError(t, err)
61-
assert.Equal(t, len(summary.Packages), len(tc.expected))
61+
assert.Len(t, summary.Packages, len(tc.expected))
6262
packages := summary.GetSortedPackages(parse.SortByPackageName)
6363

6464
for i, pkg := range packages {
@@ -120,7 +120,7 @@ func TestSortCoverage(t *testing.T) {
120120

121121
summary, err := parse.Process(f)
122122
require.NoError(t, err)
123-
assert.Equal(t, len(summary.Packages), len(tc.expected))
123+
assert.Len(t, summary.Packages, len(tc.expected))
124124
packages := summary.GetSortedPackages(parse.SortByCoverage)
125125

126126
for i, pkg := range packages {
@@ -182,7 +182,7 @@ func TestSortElapsed(t *testing.T) {
182182

183183
summary, err := parse.Process(f)
184184
require.NoError(t, err)
185-
assert.Equal(t, len(summary.Packages), len(tc.expected))
185+
assert.Len(t, summary.Packages, len(tc.expected))
186186
packages := summary.GetSortedPackages(parse.SortByElapsed)
187187

188188
for i, pkg := range packages {

0 commit comments

Comments
 (0)