replace ioutil.ReadFile with os.ReadFile

volatiletech · Nov 17, 2022 · 6f1b7bd · 6f1b7bd
1 parent 7fd5540
commit 6f1b7bd
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 13 deletions.
diff --git a/boilingcore/templates.go b/boilingcore/templates.go
@@ -6,7 +6,7 @@ import (
 	"encoding/base64"
 	"fmt"
 	"io/fs"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"sort"
 	"strings"
@@ -175,7 +175,7 @@ type fileLoader string
 
 func (f fileLoader) Load() ([]byte, error) {
 	fname := string(f)
-	b, err := ioutil.ReadFile(fname)
+	b, err := os.ReadFile(fname)
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to load template: %s", fname)
 	}

diff --git a/drivers/sqlboiler-mssql/driver/mssql_test.go b/drivers/sqlboiler-mssql/driver/mssql_test.go
@@ -27,6 +27,7 @@ import (
 	"encoding/json"
 	"flag"
 	"io/ioutil"
+	"os"
 	"os/exec"
 	"regexp"
 	"testing"
@@ -98,7 +99,7 @@ func TestDriver(t *testing.T) {
 		return
 	}
 
-	want, err := ioutil.ReadFile("mssql.golden.json")
+	want, err := os.ReadFile("mssql.golden.json")
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/drivers/sqlboiler-mysql/driver/mysql_test.go b/drivers/sqlboiler-mysql/driver/mysql_test.go
@@ -15,6 +15,7 @@ import (
 	"flag"
 	"fmt"
 	"io/ioutil"
+	"os"
 	"os/exec"
 	"testing"
 
@@ -33,7 +34,7 @@ var (
 )
 
 func TestDriver(t *testing.T) {
-	b, err := ioutil.ReadFile("testdatabase.sql")
+	b, err := os.ReadFile("testdatabase.sql")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -105,7 +106,7 @@ func TestDriver(t *testing.T) {
 				return
 			}
 
-			want, err := ioutil.ReadFile(tt.goldenJson)
+			want, err := os.ReadFile(tt.goldenJson)
 			if err != nil {
 				t.Fatal(err)
 			}

diff --git a/drivers/sqlboiler-psql/driver/psql_test.go b/drivers/sqlboiler-psql/driver/psql_test.go
@@ -34,7 +34,7 @@ var (
 )
 
 func TestAssemble(t *testing.T) {
-	b, err := ioutil.ReadFile("testdatabase.sql")
+	b, err := os.ReadFile("testdatabase.sql")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -107,7 +107,7 @@ func TestAssemble(t *testing.T) {
 				return
 			}
 
-			want, err := ioutil.ReadFile(tt.goldenJson)
+			want, err := os.ReadFile(tt.goldenJson)
 			if err != nil {
 				t.Fatal(err)
 			}

diff --git a/drivers/sqlboiler-sqlite3/driver/sqlite3_test.go b/drivers/sqlboiler-sqlite3/driver/sqlite3_test.go
@@ -24,7 +24,7 @@ var (
 
 func TestDriver(t *testing.T) {
 	rand.Seed(time.Now().Unix())
-	b, err := ioutil.ReadFile("testdatabase.sql")
+	b, err := os.ReadFile("testdatabase.sql")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -79,7 +79,7 @@ func TestDriver(t *testing.T) {
 				return
 			}
 
-			want, err := ioutil.ReadFile(tt.goldenJson)
+			want, err := os.ReadFile(tt.goldenJson)
 			if err != nil {
 				t.Fatal(err)
 			}

diff --git a/queries/query_builders_test.go b/queries/query_builders_test.go
@@ -5,6 +5,7 @@ import (
 	"flag"
 	"fmt"
 	"io/ioutil"
+	"os"
 	"path/filepath"
 	"reflect"
 	"strings"
@@ -146,7 +147,7 @@ func TestBuildQuery(t *testing.T) {
 			continue
 		}
 
-		byt, err := ioutil.ReadFile(filename)
+		byt, err := os.ReadFile(filename)
 		if err != nil {
 			t.Fatalf("Failed to read golden file %q: %v", filename, err)
 		}
@@ -516,11 +517,11 @@ func TestLimitClause(t *testing.T) {
 	t.Parallel()
 
 	tests := []struct {
-		limit *int
+		limit           *int
 		expectPredicate func(sql string) bool
 	}{
 		{nil, func(sql string) bool {
-			return !strings.Contains(sql,"LIMIT")
+			return !strings.Contains(sql, "LIMIT")
 		}},
 		{newIntPtr(0), func(sql string) bool {
 			return strings.Contains(sql, "LIMIT 0")
@@ -532,7 +533,7 @@ func TestLimitClause(t *testing.T) {
 
 	for i, test := range tests {
 		q := &Query{
-			limit: test.limit,
+			limit:   test.limit,
 			dialect: &drivers.Dialect{LQ: '"', RQ: '"', UseIndexPlaceholders: true, UseTopClause: false},
 		}
 		sql, _ := BuildQuery(q)