Skip to content

Commit 05e7d32

Browse files
authored
bump github.com/mgechev/revive from v1.1.3 to v1.1.4 (#2576)
1 parent af6159c commit 05e7d32

File tree

5 files changed

+21
-14
lines changed

5 files changed

+21
-14
lines changed

Diff for: .golangci.example.yml

+9
Original file line numberDiff line numberDiff line change
@@ -1024,6 +1024,10 @@ linters-settings:
10241024
- UnitAbbreviations
10251025

10261026
revive:
1027+
# Maximum number of open files at the same time.
1028+
# https://github.com/mgechev/revive#command-line-flags
1029+
# Defaults to unlimited.
1030+
max-open-files: 2048
10271031
# See https://github.com/mgechev/revive#available-rules for details.
10281032
ignore-generated-header: true
10291033
severity: warning
@@ -1042,6 +1046,11 @@ linters-settings:
10421046
allowInts: "0,1,2"
10431047
allowFloats: "0.0,0.,1.0,1.,2.0,2."
10441048
# https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#atomic
1049+
- name: argument-limit
1050+
severity: warning
1051+
disabled: false
1052+
arguments: [4]
1053+
# https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#atomic
10451054
- name: atomic
10461055
severity: warning
10471056
disabled: false

Diff for: go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ require (
5656
github.com/mattn/go-colorable v0.1.12
5757
github.com/mbilski/exhaustivestruct v1.2.0
5858
github.com/mgechev/dots v0.0.0-20210922191527-e955255bf517
59-
github.com/mgechev/revive v1.1.3
59+
github.com/mgechev/revive v1.1.4
6060
github.com/mitchellh/go-homedir v1.1.0
6161
github.com/mitchellh/go-ps v1.0.0
6262
github.com/moricho/tparallel v0.2.1

Diff for: go.sum

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

Diff for: pkg/config/linters_settings.go

+1
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,7 @@ type PromlinterSettings struct {
480480
}
481481

482482
type ReviveSettings struct {
483+
MaxOpenFiles int `mapstructure:"max-open-files"`
483484
IgnoreGeneratedHeader bool `mapstructure:"ignore-generated-header"`
484485
Confidence float64
485486
Severity string

Diff for: pkg/golinters/revive.go

+8-11
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func NewRevive(cfg *config.ReviveSettings) *goanalysis.Linter {
6565
return nil, err
6666
}
6767

68-
revive := lint.New(os.ReadFile)
68+
revive := lint.New(os.ReadFile, cfg.MaxOpenFiles)
6969

7070
lintingRules, err := reviveConfig.GetLintingRules(conf)
7171
if err != nil {
@@ -148,7 +148,7 @@ func reviveToIssue(pass *analysis.Pass, object *jsonObject) goanalysis.Issue {
148148
// This function mimics the GetConfig function of revive.
149149
// This allows to get default values and right types.
150150
// https://github.com/golangci/golangci-lint/issues/1745
151-
// https://github.com/mgechev/revive/blob/389ba853b0b3587f0c3b71b5f0c61ea4e23928ec/config/config.go#L155
151+
// https://github.com/mgechev/revive/blob/v1.1.4/config/config.go#L182
152152
func getReviveConfig(cfg *config.ReviveSettings) (*lint.Config, error) {
153153
conf := defaultConfig()
154154

@@ -235,7 +235,7 @@ func safeTomlSlice(r []interface{}) []interface{} {
235235
}
236236

237237
// This element is not exported by revive, so we need copy the code.
238-
// Extracted from https://github.com/mgechev/revive/blob/111721be475b73b5a2304dd01ccbcab587357fca/config/config.go#L15
238+
// Extracted from https://github.com/mgechev/revive/blob/v1.1.4/config/config.go#L15
239239
var defaultRules = []lint.Rule{
240240
&rule.VarDeclarationsRule{},
241241
&rule.PackageCommentsRule{},
@@ -310,14 +310,11 @@ var allRules = append([]lint.Rule{
310310
&rule.OptimizeOperandsOrderRule{},
311311
}, defaultRules...)
312312

313+
const defaultConfidence = 0.8
314+
313315
// This element is not exported by revive, so we need copy the code.
314-
// Extracted from https://github.com/mgechev/revive/blob/111721be475b73b5a2304dd01ccbcab587357fca/config/config.go#L143
316+
// Extracted from https://github.com/mgechev/revive/blob/v1.1.4/config/config.go#L145
315317
func normalizeConfig(cfg *lint.Config) {
316-
const defaultConfidence = 0.8
317-
if cfg.Confidence == 0 {
318-
cfg.Confidence = defaultConfidence
319-
}
320-
321318
if len(cfg.Rules) == 0 {
322319
cfg.Rules = map[string]lint.RuleConfig{}
323320
}
@@ -352,10 +349,10 @@ func normalizeConfig(cfg *lint.Config) {
352349
}
353350

354351
// This element is not exported by revive, so we need copy the code.
355-
// Extracted from https://github.com/mgechev/revive/blob/111721be475b73b5a2304dd01ccbcab587357fca/config/config.go#L210
352+
// Extracted from https://github.com/mgechev/revive/blob/v1.1.4/config/config.go#L214
356353
func defaultConfig() *lint.Config {
357354
defaultConfig := lint.Config{
358-
Confidence: 0.0,
355+
Confidence: defaultConfidence,
359356
Severity: lint.SeverityWarning,
360357
Rules: map[string]lint.RuleConfig{},
361358
}

0 commit comments

Comments
 (0)