Merge pull request #176 from noborus/deprecated-116

Changed for deprecated since 1.16

Author: noborus

example_test.go

@@ -3,7 +3,6 @@ package trdsql_test
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 
@@ -15,7 +14,7 @@ func Example() {
 Ken,Thompson,ken
 "Robert","Griesemer","gri"
 `)
-	tmpfile, err := ioutil.TempFile(os.TempDir(), "xxx")
+	tmpfile, err := os.CreateTemp(os.TempDir(), "xxx")
 	if err != nil {
 		log.Print(err)
 		return
@@ -51,7 +50,7 @@ func Example_options() {
 Ken,Thompson,ken
 "Robert","Griesemer","gri"
 `)
-	tmpfile, err := ioutil.TempFile(os.TempDir(), "xxx")
+	tmpfile, err := os.CreateTemp(os.TempDir(), "xxx")
 	if err != nil {
 		log.Print(err)
 		return

importer.go

@@ -9,7 +9,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"os"
 	"os/user"
@@ -331,9 +330,9 @@ func uncompressedReader(reader io.Reader) io.ReadCloser {
 	n, err := io.ReadAtLeast(reader, buf[:], len(buf))
 	if err != nil {
 		if errors.Is(err, io.EOF) || errors.Is(err, io.ErrUnexpectedEOF) {
-			return ioutil.NopCloser(bytes.NewReader(buf[:n]))
+			return io.NopCloser(bytes.NewReader(buf[:n]))
 		}
-		return ioutil.NopCloser(bytes.NewReader(nil))
+		return io.NopCloser(bytes.NewReader(nil))
 	}
 
 	rd := io.MultiReader(bytes.NewReader(buf[:n]), reader)
@@ -342,21 +341,21 @@ func uncompressedReader(reader io.Reader) io.ReadCloser {
 	case bytes.Equal(buf[:3], []byte{0x1f, 0x8b, 0x8}):
 		r, err = gzip.NewReader(rd)
 	case bytes.Equal(buf[:3], []byte{0x42, 0x5A, 0x68}):
-		r = ioutil.NopCloser(bzip2.NewReader(rd))
+		r = io.NopCloser(bzip2.NewReader(rd))
 	case bytes.Equal(buf[:4], []byte{0x28, 0xb5, 0x2f, 0xfd}):
 		var zr *zstd.Decoder
 		zr, err = zstd.NewReader(rd)
-		r = ioutil.NopCloser(zr)
+		r = io.NopCloser(zr)
 	case bytes.Equal(buf[:4], []byte{0x04, 0x22, 0x4d, 0x18}):
-		r = ioutil.NopCloser(lz4.NewReader(rd))
+		r = io.NopCloser(lz4.NewReader(rd))
 	case bytes.Equal(buf[:7], []byte{0xfd, 0x37, 0x7a, 0x58, 0x5a, 0x0, 0x0}):
 		var zr *xz.Reader
 		zr, err = xz.NewReader(rd)
-		r = ioutil.NopCloser(zr)
+		r = io.NopCloser(zr)
 	}
 
 	if err != nil || r == nil {
-		r = ioutil.NopCloser(rd)
+		r = io.NopCloser(rd)
 	}
 	return r
 }

importer_test.go

@@ -1,7 +1,7 @@
 package trdsql
 
 import (
-	"io/ioutil"
+	"io"
 	"os"
 	"path/filepath"
 	"reflect"
@@ -444,7 +444,7 @@ func Test_uncompressedReader(t *testing.T) {
 				t.Fatalf("extFileReader() file open error %s:%s", tt.fileName, err)
 			}
 			got := uncompressedReader(file)
-			r, err := ioutil.ReadAll(got)
+			r, err := io.ReadAll(got)
 			if err != nil {
 				t.Fatalf("extFileReader() read error %s:%s", tt.fileName, err)
 			}

trdsql_json1_test.go

@@ -1,3 +1,4 @@
+//go:build json1
 // +build json1
 
 package trdsql

trdsql_test.go

@@ -3,7 +3,6 @@ package trdsql
 import (
 	"bytes"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -541,7 +540,7 @@ func TestOutFormatRun(t *testing.T) {
 			t.Errorf("trdsql error. %s", err)
 		}
 		got := outStream.String()
-		golden, err := ioutil.ReadFile(filepath.Join("testdata", c.result+".golden"))
+		golden, err := os.ReadFile(filepath.Join("testdata", c.result+".golden"))
 		if err != nil {
 			t.Fatalf("failed reading .golden: %s", err)
 		}