Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove deprecated API use #54

Merged
merged 10 commits into from
Sep 12, 2021
Merged

Remove deprecated API use #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
dfe24c3
Remove deprecated API use
raviqqe Feb 25, 2021
66df364
Fix import
raviqqe Feb 25, 2021
c157146
Fix go.sum
raviqqe Feb 25, 2021
78bde19
Revert "Fix go.sum"
raviqqe May 4, 2021
9f190ab
Fix import
raviqqe May 4, 2021
3b74281
Tidy up go.mod
raviqqe May 4, 2021
259fd14
Merge branch 'master' into chore/update
raviqqe May 4, 2021
48c35ee
Update go.mod
raviqqe May 4, 2021
1fca20b
Merge branch 'master' into chore/update
raviqqe Jul 1, 2021
d6893ed
Specify version
raviqqe Sep 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ jobs:
steps:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: 1.17
- run: go build
- uses: golangci/golangci-lint-action@v2
with:
Expand Down
34 changes: 17 additions & 17 deletions command_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package main

import (
"bytes"
"io/ioutil"
"io"
"regexp"
"strings"
"testing"
Expand All @@ -17,10 +17,10 @@ func newTestCommand(fs billy.Filesystem, d string) *command {
return newCommand(
newArgumentParser(d),
newFileFinder(newRepositoryFileFinder(fs), fs),
newFileRenamer(fs, ioutil.Discard),
newFileRenamer(fs, io.Discard),
fs,
ioutil.Discard,
ioutil.Discard,
io.Discard,
io.Discard,
)
}

Expand All @@ -31,10 +31,10 @@ func TestCommandHelp(t *testing.T) {
err := newCommand(
newArgumentParser("."),
newFileFinder(newRepositoryFileFinder(fs), fs),
newFileRenamer(fs, ioutil.Discard),
newFileRenamer(fs, io.Discard),
fs,
b,
ioutil.Discard,
io.Discard,
).Run([]string{"--help"})
assert.Nil(t, err)

Expand All @@ -48,10 +48,10 @@ func TestCommandVersion(t *testing.T) {
err := newCommand(
newArgumentParser("."),
newFileFinder(newRepositoryFileFinder(fs), fs),
newFileRenamer(fs, ioutil.Discard),
newFileRenamer(fs, io.Discard),
fs,
b,
ioutil.Discard,
io.Discard,
).Run([]string{"--version"})
assert.Nil(t, err)

Expand All @@ -74,7 +74,7 @@ func TestCommandRenameWithoutPathOption(t *testing.T) {
f, err := fs.Open("bar")
assert.Nil(t, err)

bs, err := ioutil.ReadAll(f)
bs, err := io.ReadAll(f)
assert.Nil(t, err)

assert.Equal(t, "bar", string(bs))
Expand All @@ -94,15 +94,15 @@ func TestCommandRenameOnlyFile(t *testing.T) {
f, err := fs.Open("foo")
assert.Nil(t, err)

bs, err := ioutil.ReadAll(f)
bs, err := io.ReadAll(f)
assert.Nil(t, err)

assert.Equal(t, "blah", string(bs))

f, err = fs.Open("bar")
assert.Nil(t, err)

bs, err = ioutil.ReadAll(f)
bs, err = io.ReadAll(f)
assert.Nil(t, err)

assert.Equal(t, "baz", string(bs))
Expand All @@ -126,15 +126,15 @@ func TestCommandRenameOnlyDirectory(t *testing.T) {
f, err := fs.Open("foo/foo")
assert.Nil(t, err)

bs, err := ioutil.ReadAll(f)
bs, err := io.ReadAll(f)
assert.Nil(t, err)

assert.Equal(t, "blah", string(bs))

f, err = fs.Open("bar")
assert.Nil(t, err)

bs, err = ioutil.ReadAll(f)
bs, err = io.ReadAll(f)
assert.Nil(t, err)

assert.Equal(t, "baz", string(bs))
Expand All @@ -151,7 +151,7 @@ func TestCommandRenameWithBarePattern(t *testing.T) {
f, err := fs.Open("foo")
assert.Nil(t, err)

bs, err := ioutil.ReadAll(f)
bs, err := io.ReadAll(f)
assert.Nil(t, err)

assert.Equal(t, "bar()", string(bs))
Expand All @@ -171,7 +171,7 @@ func TestCommandRenameInDirectory(t *testing.T) {
f, err := fs.Open("foo/bar")
assert.Nil(t, err)

bs, err := ioutil.ReadAll(f)
bs, err := io.ReadAll(f)
assert.Nil(t, err)

assert.Equal(t, "bar", string(bs))
Expand All @@ -191,7 +191,7 @@ func TestCommandRenameInDirectoryWithFileSpecified(t *testing.T) {
f, err := fs.Open("foo/bar")
assert.Nil(t, err)

bs, err := ioutil.ReadAll(f)
bs, err := io.ReadAll(f)
assert.Nil(t, err)

assert.Equal(t, "bar", string(bs))
Expand All @@ -209,7 +209,7 @@ func TestCommandRenameWithRegularExpression(t *testing.T) {
f, err := fs.Open("foe")
assert.Nil(t, err)

bs, err := ioutil.ReadAll(f)
bs, err := io.ReadAll(f)
assert.Nil(t, err)

assert.Equal(t, "foe", string(bs))
Expand Down
3 changes: 1 addition & 2 deletions file_renamer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"bytes"
"fmt"
"io"
"io/ioutil"
"os"
"path/filepath"

Expand Down Expand Up @@ -56,7 +55,7 @@ func (r *fileRenamer) Rename(tr textRenamer, path string, baseDir string, verbos

defer f.Close()

bs, err := ioutil.ReadAll(f)
bs, err := io.ReadAll(f)
if err != nil {
return err
}
Expand Down
16 changes: 8 additions & 8 deletions file_renamer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package main

import (
"bytes"
"io/ioutil"
"io"
"os"
"runtime"
"testing"
Expand All @@ -22,13 +22,13 @@ func TestFileRenamerRenameFileShrinkingAfterRenaming(t *testing.T) {
tr, err := newCaseTextRenamer("bar baz", "bar", nil)
assert.Nil(t, err)

err = newFileRenamer(fs, ioutil.Discard).Rename(tr, "foo", ".", false)
err = newFileRenamer(fs, io.Discard).Rename(tr, "foo", ".", false)
assert.Nil(t, err)

f, err := fs.Open("foo")
assert.Nil(t, err)

bs, err := ioutil.ReadAll(f)
bs, err := io.ReadAll(f)
assert.Nil(t, err)

assert.Equal(t, "bar", string(bs))
Expand Down Expand Up @@ -66,7 +66,7 @@ func TestFileRenamerRenameSymlinkToFile(t *testing.T) {
tr, err := newCaseTextRenamer("foo", "bar", nil)
assert.Nil(t, err)

err = newFileRenamer(fs, ioutil.Discard).Rename(tr, "foo", ".", true)
err = newFileRenamer(fs, io.Discard).Rename(tr, "foo", ".", true)
assert.Nil(t, err)

i, err := fs.Lstat("bar")
Expand All @@ -77,7 +77,7 @@ func TestFileRenamerRenameSymlinkToFile(t *testing.T) {
f, err := fs.Open("bar")
assert.Nil(t, err)

bs, err := ioutil.ReadAll(f)
bs, err := io.ReadAll(f)
assert.Nil(t, err)

assert.Equal(t, "bar", string(bs))
Expand All @@ -92,7 +92,7 @@ func TestFileRenamerFailToRenameDirectory(t *testing.T) {
tr, err := newCaseTextRenamer("foo", "bar", nil)
assert.Nil(t, err)

err = newFileRenamer(fs, ioutil.Discard).Rename(tr, "foo", ".", true)
err = newFileRenamer(fs, io.Discard).Rename(tr, "foo", ".", true)
assert.Error(t, err)
}

Expand All @@ -108,7 +108,7 @@ func TestFileRenamerFailToRenameSymlinkToDirectory(t *testing.T) {
tr, err := newCaseTextRenamer("foo", "bar", nil)
assert.Nil(t, err)

err = newFileRenamer(fs, ioutil.Discard).Rename(tr, "foo", ".", true)
err = newFileRenamer(fs, io.Discard).Rename(tr, "foo", ".", true)
assert.Error(t, err)
}

Expand All @@ -124,7 +124,7 @@ func TestFileRenamerFileInDirectory(t *testing.T) {
tr, err := newCaseTextRenamer("foo", "bar", nil)
assert.Nil(t, err)

err = newFileRenamer(fs, ioutil.Discard).Rename(tr, "foo/foo", "foo", true)
err = newFileRenamer(fs, io.Discard).Rename(tr, "foo/foo", "foo", true)
assert.Nil(t, err)

_, err = fs.Lstat("foo/bar")
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/raviqqe/rnm

go 1.15
go 1.16

require (
github.com/bradleyjkemp/cupaloy v2.3.0+incompatible
Expand Down
1 change: 0 additions & 1 deletion go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ=
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0=
github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
Expand Down