Skip to content

Commit 61b615e

Browse files
alexandearalexandear
authored
Merge branch 'master' into add_timeformat
2 parents 44ab7d6 + 036db83 commit 61b615e

File tree

10 files changed

+53
-41
lines changed

10 files changed

+53
-41
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ body:
1111
required: true
1212
- label: Yes, I've searched similar issues on GitHub and didn't find any.
1313
required: true
14-
- label: Yes, I've included all information below (version, config, etc).
14+
- label: Yes, I've included all information below (version, config, etc.).
1515
required: true
16-
- label: Yes, I've tried with the standalone linter if available. (https://golangci-lint.run/usage/linters/)
16+
- label: Yes, I've tried with the standalone linter if available (e.g., gocritic, go vet, etc.). (https://golangci-lint.run/usage/linters/)
1717
required: true
1818

1919
- type: textarea

‎.github/workflows/pr.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
# - 1.18rc1 -> 1.18.0-rc.1
4444
go-version: ${{ env.GO_VERSION }}
4545
- name: lint
46-
uses: golangci/[email protected].0
46+
uses: golangci/[email protected].1
4747
with:
4848
version: latest
4949
# skip cache because of flaky behaviors

‎.golangci.reference.yml

+4
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,10 @@ linters-settings:
318318
# switch statements to satisfy exhaustiveness.
319319
# Default: ""
320320
ignore-enum-members: "Example.+"
321+
# Enum types matching the supplied regex do not have to be listed in
322+
# switch statements to satisfy exhaustiveness.
323+
# Default: ""
324+
ignore-enum-types: "Example.+"
321325
# Consider enums only in package scopes, not in inner scopes.
322326
# Default: false
323327
package-scope-only: true

‎go.mod

+11-11
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require (
2323
github.com/butuzov/ireturn v0.1.1
2424
github.com/charithe/durationcheck v0.0.9
2525
github.com/curioswitch/go-reassign v0.2.0
26-
github.com/daixiang0/gci v0.8.2
26+
github.com/daixiang0/gci v0.9.0
2727
github.com/denis-tingaikin/go-header v0.4.3
2828
github.com/esimonov/ifshort v1.0.4
2929
github.com/fatih/color v1.13.0
@@ -55,10 +55,10 @@ require (
5555
github.com/kkHAIKE/contextcheck v1.1.3
5656
github.com/kulti/thelper v0.6.3
5757
github.com/kunwardeep/paralleltest v1.0.6
58-
github.com/kyoh86/exportloopref v0.1.9
58+
github.com/kyoh86/exportloopref v0.1.11
5959
github.com/ldez/gomoddirectives v0.2.3
6060
github.com/ldez/tagliatelle v0.3.1
61-
github.com/leonklingele/grouper v1.1.0
61+
github.com/leonklingele/grouper v1.1.1
6262
github.com/lufeee/execinquery v1.2.1
6363
github.com/maratori/testableexamples v1.0.0
6464
github.com/maratori/testpackage v1.1.0
@@ -70,10 +70,10 @@ require (
7070
github.com/mitchellh/go-ps v1.0.0
7171
github.com/moricho/tparallel v0.2.1
7272
github.com/nakabonne/nestif v0.3.1
73-
github.com/nishanths/exhaustive v0.8.3
73+
github.com/nishanths/exhaustive v0.9.2
7474
github.com/nishanths/predeclared v0.2.2
7575
github.com/pkg/errors v0.9.1
76-
github.com/polyfloyd/go-errorlint v1.0.5
76+
github.com/polyfloyd/go-errorlint v1.0.6
7777
github.com/quasilyte/go-ruleguard/dsl v0.3.21
7878
github.com/ryancurrah/gomodguard v1.2.4
7979
github.com/ryanrolds/sqlclosecheck v0.3.0
@@ -96,7 +96,7 @@ require (
9696
github.com/stretchr/testify v1.8.1
9797
github.com/tdakkota/asciicheck v0.1.1
9898
github.com/tetafro/godot v1.4.11
99-
github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144
99+
github.com/timakin/bodyclose v0.0.0-20221125081123-e39cf3fc478e
100100
github.com/timonwong/loggercheck v0.9.3
101101
github.com/tomarrell/wrapcheck/v2 v2.7.0
102102
github.com/tommy-muehle/go-mnd/v2 v2.5.1
@@ -107,7 +107,7 @@ require (
107107
github.com/yagipy/maintidx v1.0.0
108108
github.com/yeya24/promlinter v0.2.0
109109
gitlab.com/bosi/decorder v0.2.3
110-
golang.org/x/tools v0.2.0
110+
golang.org/x/tools v0.3.0
111111
gopkg.in/yaml.v3 v3.0.1
112112
honnef.co/go/tools v0.3.3
113113
mvdan.cc/gofumpt v0.4.0
@@ -177,10 +177,10 @@ require (
177177
go.uber.org/zap v1.17.0 // indirect
178178
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
179179
golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect
180-
golang.org/x/mod v0.6.0 // indirect
181-
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect
182-
golang.org/x/sys v0.1.0 // indirect
183-
golang.org/x/text v0.3.8 // indirect
180+
golang.org/x/mod v0.7.0 // indirect
181+
golang.org/x/sync v0.1.0 // indirect
182+
golang.org/x/sys v0.2.0 // indirect
183+
golang.org/x/text v0.4.0 // indirect
184184
google.golang.org/protobuf v1.28.0 // indirect
185185
gopkg.in/ini.v1 v1.67.0 // indirect
186186
gopkg.in/yaml.v2 v2.4.0 // indirect

‎go.sum

+28-22
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/config/linters_settings.go

+1
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,7 @@ type ExhaustiveSettings struct {
289289
CheckGenerated bool `mapstructure:"check-generated"`
290290
DefaultSignifiesExhaustive bool `mapstructure:"default-signifies-exhaustive"`
291291
IgnoreEnumMembers string `mapstructure:"ignore-enum-members"`
292+
IgnoreEnumTypes string `mapstructure:"ignore-enum-types"`
292293
PackageScopeOnly bool `mapstructure:"package-scope-only"`
293294
ExplicitExhaustiveMap bool `mapstructure:"explicit-exhaustive-map"`
294295
ExplicitExhaustiveSwitch bool `mapstructure:"explicit-exhaustive-switch"`

0 commit comments

Comments
 (0)