Specify return value where name 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.

Author: kyu08

pkg/commands/oscommands/copy.go

@@ -38,13 +38,13 @@ import (
 func CopyFile(src, dst string) (err error) {
 	in, err := os.Open(src)
 	if err != nil {
-		return //nolint: nakedret
+		return err
 	}
 	defer in.Close()
 
 	out, err := os.Create(dst)
 	if err != nil {
-		return //nolint: nakedret
+		return err
 	}
 	defer func() {
 		if e := out.Close(); e != nil {
@@ -54,24 +54,24 @@ func CopyFile(src, dst string) (err error) {
 
 	_, err = io.Copy(out, in)
 	if err != nil {
-		return //nolint: nakedret
+		return err
 	}
 
 	err = out.Sync()
 	if err != nil {
-		return //nolint: nakedret
+		return err
 	}
 
 	si, err := os.Stat(src)
 	if err != nil {
-		return //nolint: nakedret
+		return err
 	}
 	err = os.Chmod(dst, si.Mode())
 	if err != nil {
-		return //nolint: nakedret
+		return err
 	}
 
-	return //nolint: nakedret
+	return err
 }
 
 // CopyDir recursively copies a directory tree, attempting to preserve permissions.
@@ -91,7 +91,7 @@ func CopyDir(src string, dst string) (err error) {
 
 	_, err = os.Stat(dst)
 	if err != nil && !os.IsNotExist(err) {
-		return //nolint: nakedret
+		return err
 	}
 	if err == nil {
 		// 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())
 	if err != nil {
-		return //nolint: nakedret
+		return err
 	}
 
 	entries, err := os.ReadDir(src)
 	if err != nil {
-		return //nolint: nakedret
+		return err
 	}
 
 	for _, entry := range entries {
@@ -117,13 +117,13 @@ func CopyDir(src string, dst string) (err error) {
 		if entry.IsDir() {
 			err = CopyDir(srcPath, dstPath)
 			if err != nil {
-				return //nolint: nakedret
+				return err
 			}
 		} else {
 			var info os.FileInfo
 			info, err = entry.Info()
 			if err != nil {
-				return //nolint: nakedret
+				return err
 			}
 
 			// Skip symlinks.
@@ -133,10 +133,10 @@ func CopyDir(src string, dst string) (err error) {
 
 			err = CopyFile(srcPath, dstPath)
 			if err != nil {
-				return //nolint: nakedret
+				return err
 			}
 		}
 	}
 
-	return //nolint: nakedret
+	return err
 }

pkg/gui/presentation/branches_test.go

@@ -18,7 +18,7 @@ import (
 
 func makeAtomic(v int32) (result atomic.Int32) {
 	result.Store(v)
-	return //nolint: nakedret
+	return result
 }
 
 func Test_getBranchDisplayStrings(t *testing.T) {