Skip to content

Commit

Permalink
replaced deprecated
Browse files Browse the repository at this point in the history
  • Loading branch information
Hidanio committed Mar 1, 2024
1 parent 59912cf commit c12935f
Show file tree
Hide file tree
Showing 12 changed files with 22 additions and 28 deletions.
4 changes: 2 additions & 2 deletions src/cmd/php-guru/dupcode/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package dupcode
import (
"flag"
"fmt"
"io/ioutil"
"log"
"os"
"regexp"
"runtime"
"sync"
Expand Down Expand Up @@ -100,7 +100,7 @@ func Main(ctx *guru.Context) (int, error) {
irConverter := irconv.NewConverter(nil)
workerResult := make(funcSet)
for f := range filenamesCh {
data, err := ioutil.ReadFile(f.Name)
data, err := os.ReadFile(f.Name)
if err != nil {
log.Printf("read %s file: %v", f.Name, err)
}
Expand Down
5 changes: 2 additions & 3 deletions src/cmd/rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package cmd
import (
"bytes"
"embed"
"io/ioutil"
"os"
"path/filepath"
"strings"
Expand Down Expand Up @@ -70,7 +69,7 @@ func ParseExternalRules(externalRules string) ([]*rules.Set, error) {

if stat.IsDir() {
dir := filename
files, err := ioutil.ReadDir(dir)
files, err := os.ReadDir(dir)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -99,7 +98,7 @@ func ParseExternalRules(externalRules string) ([]*rules.Set, error) {
func readAndParseRuleFile(filename string, ruleSets []*rules.Set) ([]*rules.Set, error) {
p := rules.NewParser()

data, err := ioutil.ReadFile(filename)
data, err := os.ReadFile(filename)
if err != nil {
return nil, err
}
Expand Down
4 changes: 2 additions & 2 deletions src/cmd/stat/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"encoding/json"
"flag"
"fmt"
"io/ioutil"
"log"
"os"
"sort"
"strings"

Expand All @@ -32,7 +32,7 @@ type ReportDiff struct {
}

func loadReportsFile(filename string) *linterOutput {
data, err := ioutil.ReadFile(filename)
data, err := os.ReadFile(filename)
if err != nil {
log.Fatalf("read reports file: %v", err)
}
Expand Down
4 changes: 2 additions & 2 deletions src/cmd/test_rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package cmd
import (
"flag"
"fmt"
"io/ioutil"
"log"
"os"
"path/filepath"
"runtime"
"strings"
Expand Down Expand Up @@ -233,7 +233,7 @@ func (s *RulesTestSuite) handleFileContents(file string) (lines []string, report
return nil, nil, fmt.Errorf("runner init fail: %v", err)
}

data, err := ioutil.ReadFile(file)
data, err := os.ReadFile(file)
if err != nil {
return nil, nil, fmt.Errorf("error read file '%s': %v", file, err)
}
Expand Down
3 changes: 1 addition & 2 deletions src/inputs/inputs.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"bytes"
"fmt"
"io"
"io/ioutil"
"os"
)

Expand Down Expand Up @@ -61,7 +60,7 @@ func (defaultSourceInput) NewReader(filename string) (ReadCloseSizer, error) {
}

func (defaultSourceInput) NewBytesReader(filename string, data []byte) (ReadCloseSizer, error) {
return NewReadCloseSizer(ioutil.NopCloser(bytes.NewReader(data)), len(data)), nil
return NewReadCloseSizer(io.NopCloser(bytes.NewReader(data)), len(data)), nil
}

type readCloserSizer struct {
Expand Down
4 changes: 2 additions & 2 deletions src/ir/codegen/context.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"go/format"
"go/token"
"go/types"
"io/ioutil"
"log"
"os"
"path/filepath"
"strings"
"time"
Expand Down Expand Up @@ -93,7 +93,7 @@ func (ctx *context) WriteGoFile(f codegenFile) error {
return fmt.Errorf("gofmt: %v", err)
}

if err := ioutil.WriteFile(fullFilename, prettySrc, 0666); err != nil {
if err := os.WriteFile(fullFilename, prettySrc, 0666); err != nil {
return fmt.Errorf("write file: %v", err)
}

Expand Down
5 changes: 2 additions & 3 deletions src/linttest/golden_linttest.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package linttest
import (
"encoding/json"
"fmt"
"io/ioutil"
"log"
"os"
"os/exec"
Expand Down Expand Up @@ -130,7 +129,7 @@ func runGoldenTest(s *GoldenTestSuite) {

func (s *GoldenTestSuite) loadGoldenFile() {
path := filepath.Join(s.BaseDir, s.Name, s.GoldenFileName)
want, err := ioutil.ReadFile(path)
want, err := os.ReadFile(path)
if err != nil {
s.suite.t.Fatalf("read golden file: %v", err)
}
Expand All @@ -146,7 +145,7 @@ type linterOutput struct {
}

func (s *GoldenTestSuite) loadReportsFile(filename string) {
data, err := ioutil.ReadFile(filename)
data, err := os.ReadFile(filename)
if err != nil {
s.suite.t.Fatalf("read reports file: %v", err)
}
Expand Down
4 changes: 2 additions & 2 deletions src/linttest/inline.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package linttest

import (
"fmt"
"io/ioutil"
"os"
"path/filepath"
"strings"
"testing"
Expand Down Expand Up @@ -136,7 +136,7 @@ func (s *inlineTestSuite) handleFileContents(file string) (lines []string, repor
return nil, nil, err
}

data, err := ioutil.ReadFile(file)
data, err := os.ReadFile(file)
if err != nil {
return nil, nil, fmt.Errorf("error read file '%s': %v", file, err)
}
Expand Down
3 changes: 1 addition & 2 deletions src/linttest/linttest.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package linttest

import (
"fmt"
"io/ioutil"
"log"
"math/rand"
"os"
Expand Down Expand Up @@ -139,7 +138,7 @@ func (s *Suite) AddNamedFile(name, contents string) {
// ReadAndAddFiles read and adds a files to a suite file list.
func (s *Suite) ReadAndAddFiles(files []string) {
for _, f := range files {
code, err := ioutil.ReadFile(f)
code, err := os.ReadFile(f)
if err != nil {
s.t.Fatalf("read PHP file: %v", err)
}
Expand Down
3 changes: 1 addition & 2 deletions src/rules/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package rules
import (
"fmt"
"io"
"io/ioutil"
"regexp"
"sort"
"strings"
Expand Down Expand Up @@ -61,7 +60,7 @@ func (p *parser) parse(filename string, r io.Reader) (*Set, error) {
//
// TODO: make phpgrep.compile accepting AST and stop
// slurping sources here + don't parse it twice.
sources, err := ioutil.ReadAll(r)
sources, err := io.ReadAll(r)
if err != nil {
return res, err
}
Expand Down
8 changes: 4 additions & 4 deletions src/tests/golden/quickfix_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package golden_test

import (
"fmt"
"io/ioutil"
"io"
"os"
"path/filepath"
"strings"
Expand Down Expand Up @@ -69,7 +69,7 @@ func (t *quickFixTest) runQuickFixTest() {
expectedFileName := file + expectedExtension
fixedFileName := file + fixExtension

testFileContent, err := ioutil.ReadFile(testFileName)
testFileContent, err := os.ReadFile(testFileName)
if err != nil {
t.Errorf("Reading file %s failed: %s", testFileName, err)
}
Expand All @@ -82,7 +82,7 @@ func (t *quickFixTest) runQuickFixTest() {

var expectedFileContent []byte
if expectedFileFound {
expectedFileContent, err = ioutil.ReadAll(expectedFile)
expectedFileContent, err = io.ReadAll(expectedFile)
if err != nil {
t.Errorf("Reading file %s failed: %s", expectedFileName, err)
}
Expand All @@ -103,7 +103,7 @@ func (t *quickFixTest) runQuickFixTest() {
test.AddNamedFile(fixedFileName, string(testFileContent))
_ = test.RunLinter()

fixedFileContent, err := ioutil.ReadFile(fixedFileName)
fixedFileContent, err := os.ReadFile(fixedFileName)
if err != nil {
t.Errorf("Reading file %s failed: %s", fixedFileName, err)
}
Expand Down
3 changes: 1 addition & 2 deletions src/workspace/git_files.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package workspace

import (
"bytes"
"io/ioutil"
"log"
"os"
"path/filepath"
Expand Down Expand Up @@ -43,7 +42,7 @@ func ReadChangesFromWorkTree(dir string, changes []git.Change, phpExtensions []s

filename := filepath.Join(dir, c.NewName)

contents, err := ioutil.ReadFile(filename)
contents, err := os.ReadFile(filename)
if err != nil {
log.Fatalf("Could not read file %s: %s", filename, err.Error())
}
Expand Down

0 comments on commit c12935f

Please sign in to comment.