Skip to content

Commit 64bcc72

Browse files
kyu08stefanhaller
authored andcommitted
Specify return value where named return value is used
After [v0.9.0](https://github.com/mvdan/gofumpt/releases/tag/v0.9.0), gofumpt prohibits "naked return" for the sake of clarity. This makes more readable when "named return value" is used. For more infomation for "prohibition of naked return": mvdan/gofumpt#285.
1 parent beb05d4 commit 64bcc72

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

pkg/commands/oscommands/copy.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@ import (
3535
// destination file exists, all it's contents will be replaced by the contents
3636
// of the source file. The file mode will be copied from the source and
3737
// the copied data is synced/flushed to stable storage.
38-
func CopyFile(src, dst string) (err error) {
38+
func CopyFile(src, dst string) error {
3939
in, err := os.Open(src)
4040
if err != nil {
41-
return //nolint: nakedret
41+
return err
4242
}
4343
defer in.Close()
4444

4545
out, err := os.Create(dst)
4646
if err != nil {
47-
return //nolint: nakedret
47+
return err
4848
}
4949
defer func() {
5050
if e := out.Close(); e != nil {
@@ -54,30 +54,30 @@ func CopyFile(src, dst string) (err error) {
5454

5555
_, err = io.Copy(out, in)
5656
if err != nil {
57-
return //nolint: nakedret
57+
return err
5858
}
5959

6060
err = out.Sync()
6161
if err != nil {
62-
return //nolint: nakedret
62+
return err
6363
}
6464

6565
si, err := os.Stat(src)
6666
if err != nil {
67-
return //nolint: nakedret
67+
return err
6868
}
6969
err = os.Chmod(dst, si.Mode())
7070
if err != nil {
71-
return //nolint: nakedret
71+
return err
7272
}
7373

74-
return //nolint: nakedret
74+
return err
7575
}
7676

7777
// CopyDir recursively copies a directory tree, attempting to preserve permissions.
7878
// Source directory must exist. If destination already exists we'll clobber it.
7979
// Symlinks are ignored and skipped.
80-
func CopyDir(src string, dst string) (err error) {
80+
func CopyDir(src string, dst string) error {
8181
src = filepath.Clean(src)
8282
dst = filepath.Clean(dst)
8383

@@ -91,7 +91,7 @@ func CopyDir(src string, dst string) (err error) {
9191

9292
_, err = os.Stat(dst)
9393
if err != nil && !os.IsNotExist(err) {
94-
return //nolint: nakedret
94+
return err
9595
}
9696
if err == nil {
9797
// it exists so let's remove it
@@ -102,12 +102,12 @@ func CopyDir(src string, dst string) (err error) {
102102

103103
err = os.MkdirAll(dst, si.Mode())
104104
if err != nil {
105-
return //nolint: nakedret
105+
return err
106106
}
107107

108108
entries, err := os.ReadDir(src)
109109
if err != nil {
110-
return //nolint: nakedret
110+
return err
111111
}
112112

113113
for _, entry := range entries {
@@ -117,13 +117,13 @@ func CopyDir(src string, dst string) (err error) {
117117
if entry.IsDir() {
118118
err = CopyDir(srcPath, dstPath)
119119
if err != nil {
120-
return //nolint: nakedret
120+
return err
121121
}
122122
} else {
123123
var info os.FileInfo
124124
info, err = entry.Info()
125125
if err != nil {
126-
return //nolint: nakedret
126+
return err
127127
}
128128

129129
// Skip symlinks.
@@ -133,10 +133,10 @@ func CopyDir(src string, dst string) (err error) {
133133

134134
err = CopyFile(srcPath, dstPath)
135135
if err != nil {
136-
return //nolint: nakedret
136+
return err
137137
}
138138
}
139139
}
140140

141-
return //nolint: nakedret
141+
return err
142142
}

0 commit comments

Comments
 (0)