sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-11-23 16:22:24 +03:00
Code Activity

Specify return value where named return value is used

Browse Source 
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":
https://github.com/mvdan/gofumpt/issues/285.
This commit is contained in:
kyu08
2025-09-22 22:42:58 +09:00
committed by Stefan Haller
parent beb05d4a61
commit 64bcc72e45
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
pkg/commands/oscommands/copy.go
View File

@@ -35,16 +35,16 @@ import (
// destination file exists, all it's contents will be replaced by the contents // destination file exists, all it's contents will be replaced by the contents
// of the source file. The file mode will be copied from the source and // of the source file. The file mode will be copied from the source and
// the copied data is synced/flushed to stable storage. // the copied data is synced/flushed to stable storage.
func CopyFile(src, dst string) (err error) { func CopyFile(src, dst string) error {
in, err := os.Open(src) in, err := os.Open(src)
if err != nil { if err != nil {
return //nolint: nakedret return err
} }
defer in.Close() defer in.Close()
out, err := os.Create(dst) out, err := os.Create(dst)
if err != nil { if err != nil {
return //nolint: nakedret return err
} }
defer func() { defer func() {
if e := out.Close(); e != nil { if e := out.Close(); e != nil {
@@ -54,30 +54,30 @@ func CopyFile(src, dst string) (err error) {
_, err = io.Copy(out, in) _, err = io.Copy(out, in)
if err != nil { if err != nil {
return //nolint: nakedret return err
} }
err = out.Sync() err = out.Sync()
if err != nil { if err != nil {
return //nolint: nakedret return err
} }
si, err := os.Stat(src) si, err := os.Stat(src)
if err != nil { if err != nil {
return //nolint: nakedret return err
} }
err = os.Chmod(dst, si.Mode()) err = os.Chmod(dst, si.Mode())
if err != nil { if err != nil {
return //nolint: nakedret return err
} }
return //nolint: nakedret return err
} }
// CopyDir recursively copies a directory tree, attempting to preserve permissions. // CopyDir recursively copies a directory tree, attempting to preserve permissions.
// Source directory must exist. If destination already exists we'll clobber it. // Source directory must exist. If destination already exists we'll clobber it.
// Symlinks are ignored and skipped. // Symlinks are ignored and skipped.
func CopyDir(src string, dst string) (err error) { func CopyDir(src string, dst string) error {
src = filepath.Clean(src) src = filepath.Clean(src)
dst = filepath.Clean(dst) dst = filepath.Clean(dst)
@@ -91,7 +91,7 @@ func CopyDir(src string, dst string) (err error) {
_, err = os.Stat(dst) _, err = os.Stat(dst)
if err != nil && !os.IsNotExist(err) { if err != nil && !os.IsNotExist(err) {
return //nolint: nakedret return err
} }
if err == nil { if err == nil {
// it exists so let's remove it // it exists so let's remove it
@@ -102,12 +102,12 @@ func CopyDir(src string, dst string) (err error) {
err = os.MkdirAll(dst, si.Mode()) err = os.MkdirAll(dst, si.Mode())
if err != nil { if err != nil {
return //nolint: nakedret return err
} }
entries, err := os.ReadDir(src) entries, err := os.ReadDir(src)
if err != nil { if err != nil {
return //nolint: nakedret return err
} }
for _, entry := range entries { for _, entry := range entries {
@@ -117,13 +117,13 @@ func CopyDir(src string, dst string) (err error) {
if entry.IsDir() { if entry.IsDir() {
err = CopyDir(srcPath, dstPath) err = CopyDir(srcPath, dstPath)
if err != nil { if err != nil {
return //nolint: nakedret return err
} }
} else { } else {
var info os.FileInfo var info os.FileInfo
info, err = entry.Info() info, err = entry.Info()
if err != nil { if err != nil {
return //nolint: nakedret return err
} }
// Skip symlinks. // Skip symlinks.
@@ -133,10 +133,10 @@ func CopyDir(src string, dst string) (err error) {
err = CopyFile(srcPath, dstPath) err = CopyFile(srcPath, dstPath)
if err != nil { if err != nil {
return //nolint: nakedret return err
} }
} }
} }
return //nolint: nakedret return err
} }