Skip to content

Commit 52b6417

Browse files
committed
Fix staticcheck lint errors
1 parent 939bf3d commit 52b6417

File tree

17 files changed

+47
-38
lines changed

17 files changed

+47
-38
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ jobs:
3030
shell: bash
3131
- name: Vet
3232
run: go vet ./...
33-
#- name: Staticcheck
34-
# if: matrix.go-version != '1.16.x'
35-
# run: staticcheck ./...
33+
- name: Staticcheck
34+
if: matrix.go-version != '1.16.x'
35+
run: staticcheck ./...
3636
- name: Test
3737
run: go test -race ./...

afero.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ type Fs interface {
103103

104104
var (
105105
ErrFileClosed = errors.New("File is closed")
106-
ErrOutOfRange = errors.New("Out of range")
107-
ErrTooLarge = errors.New("Too large")
106+
ErrOutOfRange = errors.New("out of range")
107+
ErrTooLarge = errors.New("too large")
108108
ErrFileNotFound = os.ErrNotExist
109109
ErrFileExists = os.ErrExist
110110
ErrDestinationExists = os.ErrExist

afero_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ func TestOpenFile(t *testing.T) {
9898
io.WriteString(f, "|append")
9999
f.Close()
100100

101-
f, err = fs.OpenFile(path, os.O_RDONLY, 0600)
101+
f, _ = fs.OpenFile(path, os.O_RDONLY, 0600)
102102
contents, _ := ioutil.ReadAll(f)
103103
expectedContents := "initial|append"
104104
if string(contents) != expectedContents {
@@ -700,7 +700,7 @@ func removeAllTestFiles(t *testing.T) {
700700
func equal(name1, name2 string) (r bool) {
701701
switch runtime.GOOS {
702702
case "windows":
703-
r = strings.ToLower(name1) == strings.ToLower(name2)
703+
r = strings.EqualFold(name1, name2)
704704
default:
705705
r = name1 == name2
706706
}

composite_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func TestUnionCreateExisting(t *testing.T) {
7979
fh.Close()
8080

8181
fh, _ = base.Open("/home/test/file.txt")
82-
data, err = ioutil.ReadAll(fh)
82+
data, _ = ioutil.ReadAll(fh)
8383
if string(data) != "This is a test" {
8484
t.Errorf("Got wrong data in base file")
8585
}
@@ -326,9 +326,9 @@ func TestUnionCacheWrite(t *testing.T) {
326326
t.Errorf("Failed to write file")
327327
}
328328

329-
fh.Seek(0, os.SEEK_SET)
329+
fh.Seek(0, io.SeekStart)
330330
buf := make([]byte, 4)
331-
_, err = fh.Read(buf)
331+
_, _ = fh.Read(buf)
332332
fh.Write([]byte(" IS A"))
333333
fh.Close()
334334

gcsfs/fs.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,9 @@ func (fs *Fs) Remove(name string) error {
302302
}
303303
var infos []os.FileInfo
304304
infos, err = dir.Readdir(0)
305+
if err != nil {
306+
return err
307+
}
305308
if len(infos) > 0 {
306309
return syscall.ENOTEMPTY
307310
}
@@ -345,6 +348,9 @@ func (fs *Fs) RemoveAll(path string) error {
345348

346349
var infos []os.FileInfo
347350
infos, err = dir.Readdir(0)
351+
if err != nil {
352+
return err
353+
}
348354
for _, info := range infos {
349355
nameToRemove := fs.normSeparators(info.Name())
350356
err = fs.RemoveAll(path + fs.separator + nameToRemove)

gcsfs/gcs_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ func TestGcsOpenFile(t *testing.T) {
496496
t.Fatalf("failed to close a file \"%s\": %s", name, err)
497497
}
498498

499-
file, err = gcsAfs.OpenFile(name, os.O_CREATE, 0600)
499+
_, err = gcsAfs.OpenFile(name, os.O_CREATE, 0600)
500500
if !errors.Is(err, syscall.EPERM) {
501501
t.Errorf("%v: open for write: got %v, expected %v", name, err, syscall.EPERM)
502502
}

httpFs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ type httpDir struct {
2929
}
3030

3131
func (d httpDir) Open(name string) (http.File, error) {
32-
if filepath.Separator != '/' && strings.IndexRune(name, filepath.Separator) >= 0 ||
32+
if filepath.Separator != '/' && strings.ContainsRune(name, filepath.Separator) ||
3333
strings.Contains(name, "\x00") {
3434
return nil, errors.New("http: invalid character in file path")
3535
}

ioutil_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ func TestReadFile(t *testing.T) {
3737

3838
testFS.Create("this_exists.go")
3939
filename := "rumpelstilzchen"
40-
contents, err := fsutil.ReadFile(filename)
40+
_, err := fsutil.ReadFile(filename)
4141
if err == nil {
4242
t.Fatalf("ReadFile %s: error expected, none found", filename)
4343
}
4444

4545
filename = "this_exists.go"
46-
contents, err = fsutil.ReadFile(filename)
46+
contents, err := fsutil.ReadFile(filename)
4747
if err != nil {
4848
t.Fatalf("ReadFile %s: %v", filename, err)
4949
}

mem/file.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ func (f *File) Readdirnames(n int) (names []string, err error) {
186186
func (f *File) Read(b []byte) (n int, err error) {
187187
f.fileData.Lock()
188188
defer f.fileData.Unlock()
189-
if f.closed == true {
189+
if f.closed {
190190
return 0, ErrFileClosed
191191
}
192192
if len(b) > 0 && int(f.at) == len(f.fileData.data) {
@@ -214,7 +214,7 @@ func (f *File) ReadAt(b []byte, off int64) (n int, err error) {
214214
}
215215

216216
func (f *File) Truncate(size int64) error {
217-
if f.closed == true {
217+
if f.closed {
218218
return ErrFileClosed
219219
}
220220
if f.readOnly {
@@ -236,7 +236,7 @@ func (f *File) Truncate(size int64) error {
236236
}
237237

238238
func (f *File) Seek(offset int64, whence int) (int64, error) {
239-
if f.closed == true {
239+
if f.closed {
240240
return 0, ErrFileClosed
241241
}
242242
switch whence {
@@ -251,7 +251,7 @@ func (f *File) Seek(offset int64, whence int) (int64, error) {
251251
}
252252

253253
func (f *File) Write(b []byte) (n int, err error) {
254-
if f.closed == true {
254+
if f.closed {
255255
return 0, ErrFileClosed
256256
}
257257
if f.readOnly {
@@ -330,8 +330,8 @@ func (s *FileInfo) Size() int64 {
330330

331331
var (
332332
ErrFileClosed = errors.New("File is closed")
333-
ErrOutOfRange = errors.New("Out of range")
334-
ErrTooLarge = errors.New("Too large")
333+
ErrOutOfRange = errors.New("out of range")
334+
ErrTooLarge = errors.New("too large")
335335
ErrFileNotFound = os.ErrNotExist
336336
ErrFileExists = os.ErrExist
337337
ErrDestinationExists = os.ErrExist

memmap_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ func TestMultipleOpenFiles(t *testing.T) {
214214
if err != nil {
215215
t.Error("fh.Write failed: " + err.Error())
216216
}
217-
_, err = fh1.Seek(0, os.SEEK_SET)
217+
_, err = fh1.Seek(0, io.SeekStart)
218218
if err != nil {
219219
t.Error(err)
220220
}

0 commit comments

Comments
 (0)