Skip to content

"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files

build: enable all govet checks (except fieldalignment and shadow) and fix issues.

Oleksandr Redkoc8a834f0e86a
diff --git a/.golangci.yml b/.golangci.yml
index 29b7b1772..ae9bbb24c 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -19,6 +19,11 @@ linters:
- unconvert
# Configure checks. Mostly using defaults but with some commented exceptions.
settings:
+ govet:
+ enable-all: true
+ disable:
+ - fieldalignment
+ - shadow
staticcheck:
# With staticcheck there is only one setting, so to extend the implicit
# default value it must be explicitly included.
diff --git a/backend/linkbox/linkbox.go b/backend/linkbox/linkbox.go
index 4537d657e..ad33a16fc 100644
--- a/backend/linkbox/linkbox.go
+++ b/backend/linkbox/linkbox.go
@@ -497,9 +497,6 @@ func (f *Fs) purgeCheck(ctx context.Context, dir string, check bool) error {
}
f.dirCache.FlushDir(dir)
- if err != nil {
- return err
- }
return nil
}
diff --git a/cmd/serve/docker/driver.go b/cmd/serve/docker/driver.go
index 804a8bc02..c60f77aa0 100644
--- a/cmd/serve/docker/driver.go
+++ b/cmd/serve/docker/driver.go
@@ -44,11 +44,6 @@ func NewDriver(ctx context.Context, root string, mntOpt *mountlib.Options, vfsOp
return nil, fmt.Errorf("failed to create cache directory: %s: %w", cacheDir, err)
}
- //err = file.MkdirAll(root, 0755)
- if err != nil {
- return nil, fmt.Errorf("failed to create mount root: %s: %w", root, err)
- }
-
// setup driver state
if mntOpt == nil {
mntOpt = &mountlib.Opt
diff --git a/cmd/test/info/info.go b/cmd/test/info/info.go
index 0e709f09f..6033fe0db 100644
--- a/cmd/test/info/info.go
+++ b/cmd/test/info/info.go
@@ -233,7 +233,6 @@ func (r *results) checkStringPositions(k, s string) {
fs.Infof(r.f, "Writing position file 0x%0X", s)
positionError := internal.PositionNone
res := internal.ControlResult{
- Text: s,
WriteError: make(map[internal.Position]string, 3),
GetError: make(map[internal.Position]string, 3),
InList: make(map[internal.Position]internal.Presence, 3),
diff --git a/cmd/test/info/internal/build_csv/main.go b/cmd/test/info/internal/build_csv/main.go
index fa4b15b53..d408bebb6 100644
--- a/cmd/test/info/internal/build_csv/main.go
+++ b/cmd/test/info/internal/build_csv/main.go
@@ -46,8 +46,7 @@ func main() {
var remoteNames []string
for _, r := range remotes {
remoteNames = append(remoteNames, r.Remote)
- for k, v := range *r.ControlCharacters {
- v.Text = k
+ for k := range *r.ControlCharacters {
quoted := strconv.Quote(k)
charsMap[k] = quoted[1 : len(quoted)-1]
}
diff --git a/cmd/test/info/internal/internal.go b/cmd/test/info/internal/internal.go
index ce06bbe2f..1ecf2d8fb 100644
--- a/cmd/test/info/internal/internal.go
+++ b/cmd/test/info/internal/internal.go
@@ -36,7 +36,6 @@ var PositionList = []Position{PositionMiddle, PositionLeft, PositionRight}
// ControlResult contains the result of a single character test
type ControlResult struct {
- Text string `json:"-"`
WriteError map[Position]string
GetError map[Position]string
InList map[Position]Presence
diff --git a/fs/operations/multithread_test.go b/fs/operations/multithread_test.go
index 3dc2a9ba8..d3a07ae71 100644
--- a/fs/operations/multithread_test.go
+++ b/fs/operations/multithread_test.go
@@ -105,9 +105,7 @@ func TestMultithreadCalculateNumChunks(t *testing.T) {
{size: (1 << 20) - 1, chunkSize: 2, wantNumChunks: 1 << 19},
} {
t.Run(fmt.Sprintf("%+v", test), func(t *testing.T) {
- mc := &multiThreadCopyState{
- size: test.size,
- }
+ mc := &multiThreadCopyState{}
mc.numChunks = calculateNumChunks(test.size, test.chunkSize)
assert.Equal(t, test.wantNumChunks, mc.numChunks)
})
diff --git a/lib/errors/errors.go b/lib/errors/errors.go
index ea8d70318..bb81b8529 100644
--- a/lib/errors/errors.go
+++ b/lib/errors/errors.go
@@ -57,7 +57,7 @@ func Walk(err error, f WalkFunc) {
}
}
}
- if reflect.DeepEqual(err, prev) {
+ if reflect.DeepEqual(err, prev) { //nolint:govet // deepequalerrors
break
}
}