diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2023-06-03 15:49:38 +1000 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2023-06-03 15:54:03 +1000 |
commit | 1932c2366b1cc8bfca634274a1e265ce795e79da (patch) | |
tree | 883145cf4df3dd8b7d4be9d3ec6b7ef9a79e2a8d | |
parent | dd34adb36c072b7bfd34991fdb117d7959efa113 (diff) |
Appease linter
-rw-r--r-- | pkg/commands/oscommands/copy.go | 22 | ||||
-rw-r--r-- | pkg/gui/extras_panel.go | 6 |
2 files changed, 14 insertions, 14 deletions
diff --git a/pkg/commands/oscommands/copy.go b/pkg/commands/oscommands/copy.go index f68590280..e68d0cfce 100644 --- a/pkg/commands/oscommands/copy.go +++ b/pkg/commands/oscommands/copy.go @@ -39,13 +39,13 @@ import ( func CopyFile(src, dst string) (err error) { in, err := os.Open(src) if err != nil { - return + return //nolint: nakedret } defer in.Close() out, err := os.Create(dst) if err != nil { - return + return //nolint: nakedret } defer func() { if e := out.Close(); e != nil { @@ -55,21 +55,21 @@ func CopyFile(src, dst string) (err error) { _, err = io.Copy(out, in) if err != nil { - return + return //nolint: nakedret } err = out.Sync() if err != nil { - return + return //nolint: nakedret } si, err := os.Stat(src) if err != nil { - return + return //nolint: nakedret } err = os.Chmod(dst, si.Mode()) if err != nil { - return + return //nolint: nakedret } return //nolint: nakedret @@ -92,7 +92,7 @@ func CopyDir(src string, dst string) (err error) { _, err = os.Stat(dst) if err != nil && !os.IsNotExist(err) { - return + return //nolint: nakedret } if err == nil { // it exists so let's remove it @@ -103,12 +103,12 @@ func CopyDir(src string, dst string) (err error) { err = os.MkdirAll(dst, si.Mode()) if err != nil { - return + return //nolint: nakedret } entries, err := ioutil.ReadDir(src) if err != nil { - return + return //nolint: nakedret } for _, entry := range entries { @@ -118,7 +118,7 @@ func CopyDir(src string, dst string) (err error) { if entry.IsDir() { err = CopyDir(srcPath, dstPath) if err != nil { - return + return //nolint: nakedret } } else { // Skip symlinks. @@ -128,7 +128,7 @@ func CopyDir(src string, dst string) (err error) { err = CopyFile(srcPath, dstPath) if err != nil { - return + return //nolint: nakedret } } } diff --git a/pkg/gui/extras_panel.go b/pkg/gui/extras_panel.go index 927250627..4d607f631 100644 --- a/pkg/gui/extras_panel.go +++ b/pkg/gui/extras_panel.go @@ -72,13 +72,13 @@ type prefixWriter struct { writer io.Writer } -func (self *prefixWriter) Write(p []byte) (n int, err error) { +func (self *prefixWriter) Write(p []byte) (int, error) { if !self.prefixWritten { self.prefixWritten = true // assuming we can write this prefix in one go - _, err = self.writer.Write([]byte(self.prefix)) + n, err := self.writer.Write([]byte(self.prefix)) if err != nil { - return + return n, err } } return self.writer.Write(p) |