Skip to content

Commit 866410f

Browse files
committed
style: make linter happy
1 parent 92f8281 commit 866410f

File tree

8 files changed

+14
-13
lines changed

8 files changed

+14
-13
lines changed

config/config.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"errors"
66
"fmt"
77
"io"
8-
"io/ioutil"
98
"os"
109
"path/filepath"
1110
"sort"
@@ -114,7 +113,7 @@ func Load(dir string) (*Changelog, error) {
114113

115114
// Read unmarshals config.Changelog from a io.Reader.
116115
func Read(r io.Reader) (*Changelog, error) {
117-
b, err := ioutil.ReadAll(r) // nolint: gosec
116+
b, err := io.ReadAll(r)
118117
if err != nil {
119118
return nil, err
120119
}
@@ -137,7 +136,7 @@ func Write(dir string, c Changelog) error {
137136
return err
138137
}
139138

140-
if err := ioutil.WriteFile(p, b, 0600); err != nil {
139+
if err := os.WriteFile(p, b, 0o600); err != nil {
141140
return fmt.Errorf("failed to write file %s: %w", p, err)
142141
}
143142

internal/changelog/changelog_test.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ package changelog
22

33
import (
44
"bytes"
5-
"io/ioutil"
5+
"os"
6+
"path/filepath"
67
"runtime"
78
"strings"
89
"testing"
@@ -178,7 +179,7 @@ type message struct {
178179
func messagesFrom(t *testing.T, filePath string) []message {
179180
m := []message{}
180181

181-
d, err := ioutil.ReadFile(filePath) // nolint: gosec
182+
d, err := os.ReadFile(filepath.Clean(filePath))
182183
require.NoError(t, err)
183184

184185
err = yaml.Unmarshal(d, &m)

internal/changelog/markdown_notwindows.go

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !windows
12
// +build !windows
23

34
package changelog

internal/cmd/cmd.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ func (c Command) Run() error {
136136
var dst io.Writer = os.Stdout
137137

138138
if !*c.toStdOut {
139-
f, err := os.OpenFile(*c.file, os.O_CREATE|os.O_RDWR, 0600)
139+
f, err := os.OpenFile(*c.file, os.O_CREATE|os.O_RDWR, 0o600)
140140
if err != nil {
141141
return err
142142
}

internal/cmd/cmd_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func TestInit(t *testing.T) {
2828
err := c.Run()
2929
require.NoError(t, err)
3030

31-
b, err := ioutil.ReadFile(changlogPath) // nolint: gosec
31+
b, err := os.ReadFile(changlogPath) // nolint: gosec
3232
require.NoError(t, err)
3333

3434
expectedFmt := `## 0.1.0 (%s)
@@ -66,7 +66,7 @@ func TestRelease(t *testing.T) {
6666
err := c.Run()
6767
require.NoError(t, err)
6868

69-
b, err := ioutil.ReadFile(changlogPath) // nolint: gosec
69+
b, err := os.ReadFile(changlogPath) // nolint: gosec
7070
require.NoError(t, err)
7171

7272
expectedFmt := `## 0.2.0 (%s)

internal/cmd/release.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"errors"
55
"fmt"
66
"io"
7-
"io/ioutil"
87
"os"
98
"time"
109

@@ -79,7 +78,7 @@ func (c Command) runRelease(dst io.Writer, l *flash.Logger, cfg config.Changelog
7978

8079
title := fmt.Sprintf("%s (%s)", version, time.Now().Format(dateFormat))
8180

82-
old, err := ioutil.ReadFile(*c.file)
81+
old, err := os.ReadFile(*c.file)
8382
if err != nil && !*c.toStdOut {
8483
return err
8584
}

lex.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,8 @@ func peekString(l *lexer.L, count int) string {
289289
}
290290

291291
s += string(l.Next())
292-
defer l.Rewind()
292+
293+
defer l.Rewind() //nolint: gocritic
293294
}
294295

295296
return s

parse_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package cc
33
import (
44
"encoding/json"
55
"fmt"
6-
"io/ioutil"
6+
"os"
77
"testing"
88

99
"github.com/stretchr/testify/require"
@@ -27,7 +27,7 @@ func TestParse(t *testing.T) {
2727
}
2828

2929
allTests := tests{}
30-
d, err := ioutil.ReadFile("tests.yaml")
30+
d, err := os.ReadFile("tests.yaml")
3131
require.NoError(t, err)
3232

3333
err = yaml.Unmarshal(d, &allTests)

0 commit comments

Comments
 (0)