Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deprecate maligned, add govet fieldalignment as replacement #1765

Merged
merged 2 commits into from
Feb 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .golangci.example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,7 @@ linters-settings:
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf

# enable or disable analyzers by name
# run `go tool vet help` to see all analyzers
enable:
- atomicalign
enable-all: false
Expand Down
2 changes: 2 additions & 0 deletions pkg/golinters/govet.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
_ "golang.org/x/tools/go/analysis/passes/ctrlflow" // unused, internal analyzer
"golang.org/x/tools/go/analysis/passes/deepequalerrors"
"golang.org/x/tools/go/analysis/passes/errorsas"
"golang.org/x/tools/go/analysis/passes/fieldalignment"
"golang.org/x/tools/go/analysis/passes/findcall"
"golang.org/x/tools/go/analysis/passes/httpresponse"
"golang.org/x/tools/go/analysis/passes/ifaceassert"
Expand Down Expand Up @@ -55,6 +56,7 @@ var (
copylock.Analyzer,
deepequalerrors.Analyzer,
errorsas.Analyzer,
fieldalignment.Analyzer,
findcall.Analyzer,
httpresponse.Analyzer,
ifaceassert.Analyzer,
Expand Down
3 changes: 2 additions & 1 deletion pkg/lint/lintersdb/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,8 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config {
linter.NewConfig(golinters.NewMaligned()).
WithLoadForGoAnalysis().
WithPresets(linter.PresetPerformance).
WithURL("https://github.com/mdempsky/maligned"),
WithURL("https://github.com/mdempsky/maligned").
Deprecated("The repository of the linter has been archived by the owner. Use govet 'fieldalignment' instead."),
linter.NewConfig(golinters.NewDepguard()).
WithLoadForGoAnalysis().
WithPresets(linter.PresetStyle).
Expand Down
57 changes: 57 additions & 0 deletions test/testdata/govet_fieldalignment.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
//args: -Egovet
//config: linters-settings.govet.enable=fieldalignment
package testdata

type gvfaGood struct {
y int32
x byte
z byte
}

type gvfaBad struct { // ERROR "struct of size 12 could be 8"
x byte
y int32
z byte
}

type gvfaPointerGood struct {
P *int
buf [1000]uintptr
}

type gvfaPointerBad struct { // ERROR "struct with 8008 pointer bytes could be 8"
buf [1000]uintptr
P *int
}

type gvfaPointerSorta struct {
a struct {
p *int
q uintptr
}
b struct {
p *int
q [2]uintptr
}
}

type gvfaPointerSortaBad struct { // ERROR "struct with 32 pointer bytes could be 24"
a struct {
p *int
q [2]uintptr
}
b struct {
p *int
q uintptr
}
}

type gvfaZeroGood struct {
a [0]byte
b uint32
}

type gvfaZeroBad struct { // ERROR "struct of size 8 could be 4"
a uint32
b [0]byte
}
2 changes: 1 addition & 1 deletion test/testdata/maligned.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//args: -Emaligned
//args: -Emaligned --internal-cmd-test
package testdata

type BadAlignedStruct struct { // ERROR "struct of size 24 bytes could be of size 16 bytes"
Expand Down