Skip to content

Commit 66221c3

Browse files
authored
Merge branch 'master' into add-iface
2 parents 8c5f0a1 + 2e88c4e commit 66221c3

File tree

7 files changed

+946
-38
lines changed

7 files changed

+946
-38
lines changed

.golangci.next.reference.yml

Lines changed: 920 additions & 9 deletions
Large diffs are not rendered by default.

.golangci.reference.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2704,7 +2704,6 @@ linters:
27042704
- testpackage
27052705
- thelper
27062706
- tparallel
2707-
- typecheck
27082707
- unconvert
27092708
- unparam
27102709
- unused
@@ -2819,7 +2818,6 @@ linters:
28192818
- testpackage
28202819
- thelper
28212820
- tparallel
2822-
- typecheck
28232821
- unconvert
28242822
- unparam
28252823
- unused

go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ require (
2525
github.com/blizzy78/varnamelen v0.8.0
2626
github.com/bombsimon/wsl/v4 v4.4.1
2727
github.com/breml/bidichk v0.3.1
28-
github.com/breml/errchkjson v0.3.6
28+
github.com/breml/errchkjson v0.4.0
2929
github.com/butuzov/ireturn v0.3.0
3030
github.com/butuzov/mirror v1.2.0
3131
github.com/catenacyber/perfsprint v0.7.1
@@ -39,7 +39,7 @@ require (
3939
github.com/fzipp/gocyclo v0.6.0
4040
github.com/ghostiam/protogetter v0.3.8
4141
github.com/go-critic/go-critic v0.11.4
42-
github.com/go-viper/mapstructure/v2 v2.1.0
42+
github.com/go-viper/mapstructure/v2 v2.2.0
4343
github.com/go-xmlfmt/xmlfmt v1.1.2
4444
github.com/gofrs/flock v0.12.1
4545
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a
@@ -75,7 +75,7 @@ require (
7575
github.com/maratori/testpackage v1.1.1
7676
github.com/matoous/godox v0.0.0-20230222163458-006bad1f9d26
7777
github.com/mattn/go-colorable v0.1.13
78-
github.com/mgechev/revive v1.3.9
78+
github.com/mgechev/revive v1.4.0
7979
github.com/mitchellh/go-homedir v1.1.0
8080
github.com/mitchellh/go-ps v1.0.0
8181
github.com/moricho/tparallel v0.3.2
@@ -93,7 +93,7 @@ require (
9393
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1
9494
github.com/sashamelentyev/interfacebloat v1.1.0
9595
github.com/sashamelentyev/usestdlibvars v1.27.0
96-
github.com/securego/gosec/v2 v2.21.2
96+
github.com/securego/gosec/v2 v2.21.3
9797
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c
9898
github.com/shirou/gopsutil/v3 v3.24.5
9999
github.com/sirupsen/logrus v1.9.3
@@ -126,7 +126,7 @@ require (
126126
go-simpler.org/musttag v0.12.2
127127
go-simpler.org/sloglint v0.7.2
128128
go.uber.org/automaxprocs v1.5.3
129-
golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e
129+
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0
130130
golang.org/x/tools v0.25.0
131131
gopkg.in/yaml.v3 v3.0.1
132132
honnef.co/go/tools v0.5.1

go.sum

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jsonschema/golangci.jsonschema.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,6 @@
404404
"testpackage",
405405
"thelper",
406406
"tparallel",
407-
"typecheck",
408407
"unconvert",
409408
"unparam",
410409
"unused",

jsonschema/golangci.next.jsonschema.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,19 @@
1313
"badLock",
1414
"badRegexp",
1515
"badSorting",
16+
"badSyncOnceFunc",
1617
"boolExprSimplify",
1718
"builtinShadow",
1819
"builtinShadowDecl",
1920
"captLocal",
2021
"caseOrder",
2122
"codegenComment",
23+
"commentFormatting",
2224
"commentedOutCode",
2325
"commentedOutImport",
24-
"commentFormatting",
2526
"defaultCaseOrder",
26-
"deferUnlambda",
2727
"deferInLoop",
28+
"deferUnlambda",
2829
"deprecatedComment",
2930
"docStub",
3031
"dupArg",
@@ -84,13 +85,12 @@
8485
"sprintfQuotedString",
8586
"sqlQuery",
8687
"stringConcatSimplify",
87-
"stringsCompare",
8888
"stringXbytes",
89-
"suspiciousSorting",
89+
"stringsCompare",
9090
"switchTrue",
9191
"syncMapLoadAndDelete",
92-
"timeCmpSimplify",
9392
"timeExprSimplify",
93+
"todoCommentWithoutDetail",
9494
"tooManyResultsChecker",
9595
"truncateCmp",
9696
"typeAssertChain",
@@ -203,6 +203,7 @@
203203
"structtag",
204204
"testinggoroutine",
205205
"tests",
206+
"timeformat",
206207
"unmarshal",
207208
"unreachable",
208209
"unsafeptr",
@@ -413,7 +414,6 @@
413414
"testpackage",
414415
"thelper",
415416
"tparallel",
416-
"typecheck",
417417
"unconvert",
418418
"unparam",
419419
"unused",

pkg/golinters/revive/revive.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,8 @@ func toIssue(pass *analysis.Pass, object *jsonObject) goanalysis.Issue {
184184
// This function mimics the GetConfig function of revive.
185185
// This allows to get default values and right types.
186186
// https://github.com/golangci/golangci-lint/issues/1745
187-
// https://github.com/mgechev/revive/blob/v1.3.7/config/config.go#L217
188-
// https://github.com/mgechev/revive/blob/v1.3.7/config/config.go#L169-L174
187+
// https://github.com/mgechev/revive/blob/v1.4.0/config/config.go#L218
188+
// https://github.com/mgechev/revive/blob/v1.4.0/config/config.go#L170-L176
189189
func getConfig(cfg *config.ReviveSettings) (*lint.Config, error) {
190190
conf := defaultConfig()
191191

@@ -284,7 +284,7 @@ func safeTomlSlice(r []any) []any {
284284
}
285285

286286
// This element is not exported by revive, so we need copy the code.
287-
// Extracted from https://github.com/mgechev/revive/blob/v1.3.9/config/config.go#L15
287+
// Extracted from https://github.com/mgechev/revive/blob/v1.4.0/config/config.go#L16
288288
var defaultRules = []lint.Rule{
289289
&rule.VarDeclarationsRule{},
290290
&rule.PackageCommentsRule{},
@@ -373,7 +373,7 @@ var allRules = append([]lint.Rule{
373373
const defaultConfidence = 0.8
374374

375375
// This element is not exported by revive, so we need copy the code.
376-
// Extracted from https://github.com/mgechev/revive/blob/v1.1.4/config/config.go#L145
376+
// Extracted from https://github.com/mgechev/revive/blob/v1.4.0/config/config.go#L181
377377
func normalizeConfig(cfg *lint.Config) {
378378
// NOTE(ldez): this custom section for golangci-lint should be kept.
379379
// ---
@@ -419,7 +419,7 @@ func normalizeConfig(cfg *lint.Config) {
419419
}
420420

421421
// This element is not exported by revive, so we need copy the code.
422-
// Extracted from https://github.com/mgechev/revive/blob/v1.1.4/config/config.go#L214
422+
// Extracted from https://github.com/mgechev/revive/blob/v1.4.0/config/config.go#L181
423423
func defaultConfig() *lint.Config {
424424
defaultConfig := lint.Config{
425425
Confidence: defaultConfidence,

0 commit comments

Comments
 (0)