Skip to content

Commit 78a738f

Browse files
authored
unused: remove exported-is-used option (#4890)
1 parent 5536bb5 commit 78a738f

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

Diff for: jsonschema/golangci.next.jsonschema.json

-5
Original file line numberDiff line numberDiff line change
@@ -3233,11 +3233,6 @@
32333233
"type": "boolean",
32343234
"default": false
32353235
},
3236-
"exported-is-used": {
3237-
"description": "",
3238-
"type": "boolean",
3239-
"default": true
3240-
},
32413236
"exported-fields-are-used": {
32423237
"description": "",
32433238
"type": "boolean",

Diff for: pkg/config/linters_settings.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -948,7 +948,7 @@ type UnparamSettings struct {
948948
type UnusedSettings struct {
949949
FieldWritesAreUses bool `mapstructure:"field-writes-are-uses"`
950950
PostStatementsAreReads bool `mapstructure:"post-statements-are-reads"`
951-
ExportedIsUsed bool `mapstructure:"exported-is-used"`
951+
ExportedIsUsed bool `mapstructure:"exported-is-used"` // Deprecated
952952
ExportedFieldsAreUsed bool `mapstructure:"exported-fields-are-used"`
953953
ParametersAreUsed bool `mapstructure:"parameters-are-used"`
954954
LocalVariablesAreUsed bool `mapstructure:"local-variables-are-used"`

Diff for: pkg/config/loader.go

+5
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,11 @@ func (l *Loader) handleLinterOptionDeprecations() {
433433
l.log.Warnf("The configuration option `linters.stylecheck.go` is deprecated, please use global `run.go`.")
434434
}
435435

436+
// Deprecated since v1.60.0
437+
if !l.cfg.LintersSettings.Unused.ExportedIsUsed {
438+
l.log.Warnf("The configuration option `linters.unused.exported-is-used` is deprecated.")
439+
}
440+
436441
// Deprecated since v1.58.0
437442
if l.cfg.LintersSettings.SlogLint.ContextOnly {
438443
l.log.Warnf("The configuration option `linters.sloglint.context-only` is deprecated, please use `linters.sloglint.context`.")

Diff for: pkg/golinters/unused/unused.go

+7-5
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,13 @@ func getUnusedResults(pass *analysis.Pass, settings *config.UnusedSettings) unus
9090
opts := unused.Options{
9191
FieldWritesAreUses: settings.FieldWritesAreUses,
9292
PostStatementsAreReads: settings.PostStatementsAreReads,
93-
ExportedIsUsed: settings.ExportedIsUsed,
94-
ExportedFieldsAreUsed: settings.ExportedFieldsAreUsed,
95-
ParametersAreUsed: settings.ParametersAreUsed,
96-
LocalVariablesAreUsed: settings.LocalVariablesAreUsed,
97-
GeneratedIsUsed: settings.GeneratedIsUsed,
93+
// Related to https://github.com/golangci/golangci-lint/issues/4218
94+
// https://github.com/dominikh/go-tools/issues/1474#issuecomment-1850760813
95+
ExportedIsUsed: true,
96+
ExportedFieldsAreUsed: settings.ExportedFieldsAreUsed,
97+
ParametersAreUsed: settings.ParametersAreUsed,
98+
LocalVariablesAreUsed: settings.LocalVariablesAreUsed,
99+
GeneratedIsUsed: settings.GeneratedIsUsed,
98100
}
99101

100102
// ref: https://github.com/dominikh/go-tools/blob/4ec1f474ca6c0feb8e10a8fcca4ab95f5b5b9881/internal/cmd/unused/unused.go#L68

0 commit comments

Comments
 (0)