Skip to content

Commit aa1d515

Browse files
committed
Use walrus assignment consistently
1 parent f7a03c4 commit aa1d515

File tree

11 files changed

+17
-15
lines changed

11 files changed

+17
-15
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

77
## [Unreleased]
8+
### Style
9+
- Use walrus assignment where possible.
810

911
## [v7.10.0] - 2025-10-07
1012
### Security

backend/azure/fileSystem_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,11 @@ func (s *FileSystemTestSuite) TestScheme() {
122122
}
123123

124124
func (s *FileSystemTestSuite) TestRetry() {
125-
var doNothing = func() error {
125+
doNothing := func() error {
126126
return nil
127127
}
128128

129-
var errorRetry = func(wrapped func() error) error {
129+
errorRetry := func(wrapped func() error) error {
130130
return errors.New("i always error")
131131
}
132132

backend/ftp/file_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func (ts *fileTestSuite) TestRead() {
7373
path: fp,
7474
}
7575
// test successful read
76-
var localFile = bytes.NewBuffer([]byte{})
76+
localFile := bytes.NewBuffer([]byte{})
7777
b, copyErr := io.Copy(localFile, ftpfile)
7878
ts.Require().NoError(copyErr, "no error expected")
7979
ts.Len(contents, int(b), "byte count after copy")
@@ -217,7 +217,7 @@ func (ts *fileTestSuite) TestSeek() {
217217
// seek to position 6, whence 0
218218
_, err = ftpfile.Seek(6, 0)
219219
ts.Require().NoError(err, "no error expected")
220-
var localFile = bytes.NewBuffer([]byte{})
220+
localFile := bytes.NewBuffer([]byte{})
221221
_, err = io.Copy(localFile, ftpfile)
222222
ts.Require().NoError(err, "no error expected")
223223
ts.Equal("world!", localFile.String(), "Seeking should move the ftp file cursor as expected")

backend/ftp/location.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func (l *Location) List() ([]string, error) {
5757
// - If the user cares about the distinction between an empty location and a non-existent one, Location.Exists() should
5858
// be checked first.
5959
func (l *Location) ListByPrefix(prefix string) ([]string, error) {
60-
var filenames = make([]string, 0)
60+
filenames := make([]string, 0)
6161

6262
// validate prefix
6363
if err := utils.ValidatePrefix(prefix); err != nil {

backend/ftp/options_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ func (s *optionsSuite) TestFetchHostPortString() {
166166
}
167167

168168
func (s *optionsSuite) TestIsDisableEPSV() {
169-
var trueVal = true
170-
var falseVal = false
169+
trueVal := true
170+
falseVal := false
171171
tests := []struct {
172172
description string
173173
options Options

backend/gs/file_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ func (ts *fileTestSuite) TestRead() {
101101
file, err := fs.NewFile(bucketName, "/"+objectName)
102102
ts.Require().NoError(err, "Shouldn't fail creating new file")
103103

104-
var localFile = bytes.NewBuffer([]byte{})
104+
localFile := bytes.NewBuffer([]byte{})
105105

106106
buffer := make([]byte, utils.TouchCopyMinBufferSize)
107107
_, copyErr := io.CopyBuffer(localFile, file, buffer)

backend/os/file_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ func (s *osFileTest) TestSafeOsRename() {
324324
testfile := path.Join(dir, "original.txt")
325325
file1, err := s.fileSystem.NewFile("", testfile)
326326
s.Require().NoError(err)
327-
var testBytes = []byte("test me")
327+
testBytes := []byte("test me")
328328
_, err = file1.Write(testBytes)
329329
s.Require().NoError(err)
330330
s.Require().NoError(file1.Close())
@@ -354,7 +354,7 @@ func (s *osFileTest) TestOsCopy() {
354354

355355
file1, err := s.fileSystem.NewFile("", path.Join(dir, "original.txt"))
356356
s.Require().NoError(err)
357-
var testBytes = []byte("test me")
357+
testBytes := []byte("test me")
358358
_, err = file1.Write(testBytes)
359359
s.Require().NoError(err)
360360
s.Require().NoError(file1.Close())

backend/s3/file.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ func waitUntilFileExists(file vfs.File, retries int) error {
681681
if retries == -1 {
682682
return nil
683683
}
684-
var retryCount = 0
684+
retryCount := 0
685685
for {
686686
if retryCount == retries {
687687
return fmt.Errorf("failed to find file %s after %d retries", file, retries)

backend/s3/file_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func (ts *fileTestSuite) TestRead() {
6060
file, err := fs.NewFile("bucket", "/some/path/file.txt")
6161
ts.Require().NoError(err, "Shouldn't fail creating new file")
6262

63-
var localFile = bytes.NewBuffer([]byte{})
63+
localFile := bytes.NewBuffer([]byte{})
6464
s3cliMock.
6565
On("HeadObject", matchContext, mock.AnythingOfType("*s3.HeadObjectInput")).
6666
Return(&s3.HeadObjectOutput{ContentLength: aws.Int64(12)}, nil).

backend/sftp/file_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func (ts *fileTestSuite) TestRead() {
6464
sftpfile: &nopWriteCloser{strings.NewReader(contents)},
6565
}
6666
// perform test
67-
var localFile = bytes.NewBuffer([]byte{})
67+
localFile := bytes.NewBuffer([]byte{})
6868

6969
buffer := make([]byte, utils.TouchCopyMinBufferSize)
7070
b, copyErr := io.CopyBuffer(localFile, sftpfile, buffer)
@@ -98,7 +98,7 @@ func (ts *fileTestSuite) TestSeek() {
9898
_, seekErr := sftpfile.Seek(6, 0)
9999
ts.Require().NoError(seekErr, "no error expected")
100100

101-
var localFile = bytes.NewBuffer([]byte{})
101+
localFile := bytes.NewBuffer([]byte{})
102102

103103
buffer := make([]byte, utils.TouchCopyMinBufferSize)
104104
_, copyErr := io.CopyBuffer(localFile, sftpfile, buffer)

0 commit comments

Comments
 (0)