sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-31 14:24:25 +03:00
Code Activity

Appease linter

Browse Source
This commit is contained in:
Jesse Duffield
2023-06-03 15:49:38 +10:00
parent dd34adb36c
commit 1932c2366b
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,13 +39,13 @@ import (
func CopyFile(src, dst string) (err error) { func CopyFile(src, dst string) (err error) {
in, err := os.Open(src) in, err := os.Open(src)
if err != nil { if err != nil {
return return //nolint: nakedret
} }
defer in.Close() defer in.Close()
out, err := os.Create(dst) out, err := os.Create(dst)
if err != nil { if err != nil {
return return //nolint: nakedret
} }
defer func() { defer func() {
if e := out.Close(); e != nil { if e := out.Close(); e != nil {
@ -55,21 +55,21 @@ func CopyFile(src, dst string) (err error) {
_, err = io.Copy(out, in) _, err = io.Copy(out, in)
if err != nil { if err != nil {
return return //nolint: nakedret
} }
err = out.Sync() err = out.Sync()
if err != nil { if err != nil {
return return //nolint: nakedret
} }
si, err := os.Stat(src) si, err := os.Stat(src)
if err != nil { if err != nil {
return return //nolint: nakedret
} }
err = os.Chmod(dst, si.Mode()) err = os.Chmod(dst, si.Mode())
if err != nil { if err != nil {
return return //nolint: nakedret
} }
return //nolint: nakedret return //nolint: nakedret
@ -92,7 +92,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 return //nolint: nakedret
} }
if err == nil { if err == nil {
// it exists so let's remove it // 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()) err = os.MkdirAll(dst, si.Mode())
if err != nil { if err != nil {
return return //nolint: nakedret
} }
entries, err := ioutil.ReadDir(src) entries, err := ioutil.ReadDir(src)
if err != nil { if err != nil {
return return //nolint: nakedret
} }
for _, entry := range entries { for _, entry := range entries {
@ -118,7 +118,7 @@ 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 return //nolint: nakedret
} }
} else { } else {
// Skip symlinks. // Skip symlinks.
@ -128,7 +128,7 @@ func CopyDir(src string, dst string) (err error) {
err = CopyFile(srcPath, dstPath) err = CopyFile(srcPath, dstPath)
if err != nil { if err != nil {
return return //nolint: nakedret
} }
} }
} }

6
pkg/gui/extras_panel.go
View File

@ -72,13 +72,13 @@ type prefixWriter struct {
writer io.Writer writer io.Writer
} }
func (self *prefixWriter) Write(p []byte) (n int, err error) { func (self *prefixWriter) Write(p []byte) (int, error) {
if !self.prefixWritten { if !self.prefixWritten {
self.prefixWritten = true self.prefixWritten = true
// assuming we can write this prefix in one go // 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 { if err != nil {
return return n, err
} }
} }
return self.writer.Write(p) return self.writer.Write(p)