go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-11-29 22:48:24 +02:00
Code Issues Releases Activity

Appease linter

Browse Source
This commit is contained in:
Jesse Duffield
2023-08-02 08:21:55 +10:00
parent df0c3b3ea8
commit c92ed07082
6 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/integration/clients/go_test.go
View File

@@ -10,7 +10,6 @@ import (
"bytes"
"errors"
"io"
"io/ioutil"
"os"
"os/exec"
"testing"
@@ -82,7 +81,7 @@ func runCmdHeadless(cmd *exec.Cmd) error {
return err
}
_, _ = io.Copy(ioutil.Discard, f)
_, _ = io.Copy(io.Discard, f)
if cmd.Wait() != nil {
// return an error with the stderr output

3
pkg/integration/components/runner.go
View File

@@ -2,7 +2,6 @@ package components
import (
"fmt"
"io/ioutil"
"os"
"os/exec"
"path/filepath"
@@ -222,7 +221,7 @@ func findOrCreateDir(path string) {
func deleteAndRecreateEmptyDir(path string) {
// remove contents of integration test directory
dir, err := ioutil.ReadDir(path)
dir, err := os.ReadDir(path)
if err != nil {
if os.IsNotExist(err) {
err = os.Mkdir(path, 0o777)

13
pkg/integration/tests/test_list_generator.go
View File

@@ -12,7 +12,6 @@ import (
"fmt"
"go/format"
"io/fs"
"io/ioutil"
"os"
"strings"
@@ -26,19 +25,19 @@ func main() {
if err != nil {
panic(err)
}
if err := ioutil.WriteFile("test_list.go", formattedCode, 0o644); err != nil {
if err := os.WriteFile("test_list.go", formattedCode, 0o644); err != nil {
panic(err)
}
}
func generateCode() []byte {
// traverse parent directory to get all subling directories
directories, err := ioutil.ReadDir("../tests")
directories, err := os.ReadDir("../tests")
if err != nil {
panic(err)
}
directories = lo.Filter(directories, func(file os.FileInfo, _ int) bool {
directories = lo.Filter(directories, func(file fs.DirEntry, _ int) bool {
// 'shared' is a special folder containing shared test code so we
// ignore it here
return file.IsDir() && file.Name() != "shared"
@@ -62,8 +61,8 @@ func generateCode() []byte {
return buf.Bytes()
}
func appendDirTests(dir fs.FileInfo, buf *bytes.Buffer) {
files, err := ioutil.ReadDir(fmt.Sprintf("../tests/%s", dir.Name()))
func appendDirTests(dir fs.DirEntry, buf *bytes.Buffer) {
files, err := os.ReadDir(fmt.Sprintf("../tests/%s", dir.Name()))
if err != nil {
panic(err)
}
@@ -77,7 +76,7 @@ func appendDirTests(dir fs.FileInfo, buf *bytes.Buffer) {
strings.TrimSuffix(file.Name(), ".go"),
)
fileContents, err := ioutil.ReadFile(fmt.Sprintf("../tests/%s/%s", dir.Name(), file.Name()))
fileContents, err := os.ReadFile(fmt.Sprintf("../tests/%s/%s", dir.Name(), file.Name()))
if err != nil {
panic(err)
}