Skip to content

Commit

Permalink
Remove usage of io/ioutil
Browse files Browse the repository at this point in the history
  • Loading branch information
jackc committed Mar 9, 2024
1 parent e066eba commit 22a33fd
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 9 deletions.
7 changes: 3 additions & 4 deletions copy_dir.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package main

import (
"io/ioutil"
"os"
"path/filepath"
)
Expand All @@ -13,7 +12,7 @@ func copyCodePackageDir(src, dst string) error {
return err
}

entries, err := ioutil.ReadDir(src)
entries, err := os.ReadDir(src)
if err != nil {
return err
}
Expand All @@ -27,12 +26,12 @@ func copyCodePackageDir(src, dst string) error {
return err
}
} else {
data, err := ioutil.ReadFile(srcPath)
data, err := os.ReadFile(srcPath)
if err != nil {
return err
}

err = ioutil.WriteFile(dstPath, data, e.Mode().Perm())
err = os.WriteFile(dstPath, data, e.Type().Perm())
if err != nil {
return err
}
Expand Down
5 changes: 2 additions & 3 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"context"
"errors"
"fmt"
"io/ioutil"
"net"
"os"
"os/exec"
Expand Down Expand Up @@ -1027,7 +1026,7 @@ func findMigrationsForRenumber(path string) ([]string, error) {

path = strings.TrimRight(path, string(filepath.Separator))

fileInfos, err := ioutil.ReadDir(path)
fileInfos, err := os.ReadDir(path)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -1117,7 +1116,7 @@ func LoadConfig() (*Config, error) {
}

func appendConfigFromFile(config *Config, path string) error {
fileBytes, err := ioutil.ReadFile(path)
fileBytes, err := os.ReadFile(path)
if err != nil {
return err
}
Expand Down
3 changes: 1 addition & 2 deletions ssh_tunnel.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package main

import (
"fmt"
"io/ioutil"
"net"
"os"

Expand Down Expand Up @@ -51,7 +50,7 @@ func SSHAgent() ssh.AuthMethod {
}

func PrivateKey(path string) ssh.AuthMethod {
key, err := ioutil.ReadFile(path)
key, err := os.ReadFile(path)
if err != nil {
return nil
}
Expand Down

0 comments on commit 22a33fd

Please sign in to comment.