Skip to content

chore: enable and fixes rules from gocritic #246

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.

Sign up for GitHub

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

Open
mmorel-35 wants to merge 5 commits into
base: main
Choose a base branch
from
Open

chore: enable and fixes rules from gocritic #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7bac03d
chore: enable gocritic but disable non compliant rules
mmorel-35 Aug 11, 2026
302b68d
fix: emptyStringTest issues from gocritic
mmorel-35 Aug 11, 2026
791adc6
fix: unnecessaryDefer issues from gocritic
mmorel-35 Aug 11, 2026
ae447da
fix: ifElseChain issues from gocritic
mmorel-35 Aug 11, 2026
1f2af12
fix: assignOp issues from gocritic
mmorel-35 Aug 11, 2026
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
14 changes: 14 additions & 0 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ version: "2"
linters:
enable:
- errorlint
- gocritic
- unconvert
- unparam
exclusions:
Expand All @@ -11,6 +12,19 @@ linters:
- comments
- std-error-handling
settings:
gocritic:
disabled-checks:
- appendAssign
- builtinShadow
- deferInLoop
- hugeParam
- importShadow
- paramTypeCombine
- rangeValCopy
- sloppyReassign
- unnamedResult
- whyNoLint
Comment on lines +16 to +26

@thaJeztah thaJeztah Aug 19, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the intent to address all of these (in follow-ups), or are there that cannot (yet) be addressed (e.g. due to go versions).

It's good to leave a comment for each to outline if it's either a permanent (won't fix because) or temporary (TODO).

At least some of them stood out as "should likely be fixed" (whyNoLint, rangeValCopy, importShadow), and I know the builtinShadow is a bit too opinionated (it's "OK", but sometimes not worth the code-churn.

@mmorel-35 mmorel-35 Aug 20, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you already know if you don't want some of them ? Otherwise the intention is indeed to try to comply with those that are the moby group and the sys project particularly usual practices.

enable-all: true
staticcheck:
# Enable all options, with some exceptions.
# For defaults, see https://golangci-lint.run/usage/linters/#staticcheck
Expand Down
7 changes: 4 additions & 3 deletions capability/capability_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,12 @@ func mkString(c Capabilities, max CapType) (ret string) {
ret = "{"
for i := CapType(1); i <= max; i <<= 1 {
ret += " " + i.String() + "=\""
if c.Empty(i) {
switch {
case c.Empty(i):
ret += "empty"
} else if c.Full(i) {
case c.Full(i):
ret += "full"
} else {
default:
ret += c.StringCap(i)
}
ret += "\""
Expand Down
2 changes: 1 addition & 1 deletion capability/capability_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ func TestNewPid2Load(t *testing.T) {
// Assuming that at least bounding set is not empty.
bset := c.StringCap(BOUNDING)
t.Logf("Bounding set: %s", bset)
if len(bset) == 0 {
if bset == "" {
t.Fatal("loaded bounding set: want non-empty, got empty")
}
}
Expand Down
8 changes: 3 additions & 5 deletions mount/sharedsubtree_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,9 +313,7 @@ func TestSubtreeUnbindable(t *testing.T) {
} else if err == nil {
t.Fatalf("%q should not have been bindable", sourceDir)
}
defer func() {
if err := Unmount(targetDir); err != nil {
t.Fatal(err)
}
}()
if err := Unmount(targetDir); err != nil {
t.Fatal(err)
}
}
2 changes: 1 addition & 1 deletion user/idtools_unix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ func lookupSubRangesFile(path string, usr User) ([]IDMap, error) {
ParentID: idrange.SubID,
Count: idrange.Count,
})
containerID = containerID + idrange.Count
containerID += idrange.Count
}
return idMap, nil
}