Skip to content

Commit ff82102

Browse files
committed
removed use of deprecated ioutil
1 parent 4c42f69 commit ff82102

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

canal/canal.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package canal
33
import (
44
"context"
55
"fmt"
6-
"io/ioutil"
6+
"io"
77
"os"
88
"regexp"
99
"strconv"
@@ -165,7 +165,7 @@ func (c *Canal) prepareDumper() error {
165165
}
166166

167167
if c.cfg.Dump.DiscardErr {
168-
c.dumper.SetErrOut(ioutil.Discard)
168+
c.dumper.SetErrOut(io.Discard)
169169
} else {
170170
c.dumper.SetErrOut(os.Stderr)
171171
}

canal/config.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package canal
22

33
import (
44
"crypto/tls"
5-
"io/ioutil"
65
"math/rand"
76
"net"
87
"os"
@@ -99,7 +98,7 @@ type Config struct {
9998
}
10099

101100
func NewConfigWithFile(name string) (*Config, error) {
102-
data, err := ioutil.ReadFile(name)
101+
data, err := os.ReadFile(name)
103102
if err != nil {
104103
return nil, errors.Trace(err)
105104
}

dump/schema_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package dump
33
import (
44
"bytes"
55
"fmt"
6-
"io/ioutil"
6+
"io"
77
"os"
88

99
"github.com/go-mysql-org/go-mysql/client"
@@ -83,19 +83,19 @@ func (s *schemaTestSuite) TestDump(c *C) {
8383
// Using mysql 5.7 can't work, error:
8484
// mysqldump: Error 1412: Table definition has changed,
8585
// please retry transaction when dumping table `test_replication` at row: 0
86-
// err := s.d.Dump(ioutil.Discard)
86+
// err := s.d.Dump(io.Discard)
8787
// c.Assert(err, IsNil)
8888

8989
s.d.AddDatabases("test1", "test2")
9090

9191
s.d.AddIgnoreTables("test1", "t2")
9292

93-
err := s.d.Dump(ioutil.Discard)
93+
err := s.d.Dump(io.Discard)
9494
c.Assert(err, IsNil)
9595

9696
s.d.AddTables("test1", "t1")
9797

98-
err = s.d.Dump(ioutil.Discard)
98+
err = s.d.Dump(io.Discard)
9999
c.Assert(err, IsNil)
100100
}
101101

0 commit comments

Comments
 (0)