Skip to content

Commit ff4417c

Browse files
committed
chore: groups unused files to a package
1 parent e5051e5 commit ff4417c

File tree

4 files changed

+19
-7
lines changed

4 files changed

+19
-7
lines changed
File renamed without changes.

pkg/golinters/unused.go renamed to pkg/golinters/unused/unused.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package golinters
1+
package unused
22

33
import (
44
"fmt"
@@ -17,14 +17,14 @@ import (
1717
"github.com/golangci/golangci-lint/pkg/result"
1818
)
1919

20-
const unusedName = "unused"
20+
const name = "unused"
2121

22-
func NewUnused(settings *config.UnusedSettings, scSettings *config.StaticCheckSettings) *goanalysis.Linter {
22+
func New(settings *config.UnusedSettings, scSettings *config.StaticCheckSettings) *goanalysis.Linter {
2323
var mu sync.Mutex
2424
var resIssues []goanalysis.Issue
2525

2626
analyzer := &analysis.Analyzer{
27-
Name: unusedName,
27+
Name: name,
2828
Doc: unused.Analyzer.Analyzer.Doc,
2929
Requires: unused.Analyzer.Analyzer.Requires,
3030
Run: func(pass *analysis.Pass) (any, error) {
@@ -44,7 +44,7 @@ func NewUnused(settings *config.UnusedSettings, scSettings *config.StaticCheckSe
4444
internal.SetAnalyzerGoVersion(analyzer, internal.GetGoVersion(scSettings))
4545

4646
return goanalysis.NewLinter(
47-
unusedName,
47+
name,
4848
"Checks Go code for unused constants, variables, functions and types",
4949
[]*analysis.Analyzer{analyzer},
5050
nil,
@@ -75,7 +75,7 @@ func runUnused(pass *analysis.Pass, cfg *config.UnusedSettings) []goanalysis.Iss
7575
}
7676

7777
issue := goanalysis.NewIssue(&result.Issue{
78-
FromLinter: unusedName,
78+
FromLinter: name,
7979
Text: fmt.Sprintf("%s %s is unused", object.Kind, object.Name),
8080
Pos: object.Position,
8181
}, pass)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package unused
2+
3+
import (
4+
"testing"
5+
6+
"github.com/golangci/golangci-lint/test/testshared/integration"
7+
)
8+
9+
func TestFromTestdata(t *testing.T) {
10+
integration.RunTestdata(t)
11+
}

pkg/lint/lintersdb/builder_linter.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ import (
101101
"github.com/golangci/golangci-lint/pkg/golinters/tparallel"
102102
"github.com/golangci/golangci-lint/pkg/golinters/unconvert"
103103
"github.com/golangci/golangci-lint/pkg/golinters/unparam"
104+
"github.com/golangci/golangci-lint/pkg/golinters/unused"
104105
"github.com/golangci/golangci-lint/pkg/golinters/whitespace"
105106
"github.com/golangci/golangci-lint/pkg/golinters/zerologlint"
106107
"github.com/golangci/golangci-lint/pkg/lint/linter"
@@ -762,7 +763,7 @@ func (LinterBuilder) Build(cfg *config.Config) ([]*linter.Config, error) {
762763
WithLoadForGoAnalysis().
763764
WithURL("https://github.com/mvdan/unparam"),
764765

765-
linter.NewConfig(golinters.NewUnused(&cfg.LintersSettings.Unused, &cfg.LintersSettings.Staticcheck)).
766+
linter.NewConfig(unused.New(&cfg.LintersSettings.Unused, &cfg.LintersSettings.Staticcheck)).
766767
WithEnabledByDefault().
767768
WithSince("v1.20.0").
768769
WithLoadForGoAnalysis().

0 commit comments

Comments
 (0)