chore: remove refs to deprecated io/ioutil (#798)

alecthomas · Jul 10, 2023 · b9a63eb · b9a63eb
1 parent 0e7ec95
commit b9a63eb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/formatters/html/html_test.go b/formatters/html/html_test.go
@@ -3,7 +3,7 @@ package html
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"regexp"
 	"strings"
 	"testing"
@@ -28,7 +28,7 @@ func BenchmarkHTMLFormatter(b *testing.B) {
 	for i := 0; i < b.N; i++ {
 		it, err := lexers.Get("go").Tokenise(nil, "package main\nfunc main()\n{\nprintln(`hello world`)\n}\n")
 		assert.NoError(b, err)
-		err = formatter.Format(ioutil.Discard, styles.Fallback, it)
+		err = formatter.Format(io.Discard, styles.Fallback, it)
 		assert.NoError(b, err)
 	}
 }

diff --git a/formatters/svg/svg.go b/formatters/svg/svg.go
@@ -6,7 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
+	"os"
 	"path"
 	"strings"
 
@@ -34,7 +34,7 @@ func EmbedFontFile(fontFamily string, fileName string) (option Option, err error
 	}
 
 	var content []byte
-	if content, err = ioutil.ReadFile(fileName); err == nil {
+	if content, err = os.ReadFile(fileName); err == nil {
 		option = EmbedFont(fontFamily, base64.StdEncoding.EncodeToString(content), format)
 	}
 	return

diff --git a/lexers/lexers_test.go b/lexers/lexers_test.go
@@ -2,7 +2,7 @@ package lexers_test
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"io"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -22,7 +22,7 @@ func TestCompileAllRegexes(t *testing.T) {
 	for _, lexer := range lexers.GlobalLexerRegistry.Lexers {
 		it, err := lexer.Tokenise(nil, "")
 		assert.NoError(t, err, "%s failed", lexer.Config().Name)
-		err = formatters.NoOp.Format(ioutil.Discard, styles.SwapOff, it)
+		err = formatters.NoOp.Format(io.Discard, styles.SwapOff, it)
 		assert.NoError(t, err, "%s failed", lexer.Config().Name)
 	}
 }
@@ -68,7 +68,7 @@ func FileTest(t *testing.T, lexer chroma.Lexer, actualFilename, expectedFilename
 	t.Helper()
 	t.Run(lexer.Config().Name+"/"+actualFilename, func(t *testing.T) {
 		// Read and tokenise source text.
-		actualText, err := ioutil.ReadFile(actualFilename)
+		actualText, err := os.ReadFile(actualFilename)
 		assert.NoError(t, err)
 		actual, err := chroma.Tokenise(lexer, nil, string(actualText))
 		assert.NoError(t, err)
@@ -97,7 +97,7 @@ func FileTest(t *testing.T, lexer chroma.Lexer, actualFilename, expectedFilename
 
 // Test source files are in the form <key>.<key> and validation data is in the form <key>.<key>.expected.
 func TestLexers(t *testing.T) {
-	files, err := ioutil.ReadDir("testdata")
+	files, err := os.ReadDir("testdata")
 	assert.NoError(t, err)
 
 	for _, file := range files {
@@ -111,7 +111,7 @@ func TestLexers(t *testing.T) {
 			lexer := lexers.Get(file.Name())
 			assert.NotZero(t, lexer)
 
-			subFiles, err := ioutil.ReadDir(dirname)
+			subFiles, err := os.ReadDir(dirname)
 			assert.NoError(t, err)
 
 			for _, subFile := range subFiles {
@@ -148,13 +148,13 @@ func TestLexers(t *testing.T) {
 func FileTestAnalysis(t *testing.T, lexer chroma.Lexer, actualFilepath, expectedFilepath string) {
 	t.Helper()
 	t.Run(lexer.Config().Name+"/"+actualFilepath, func(t *testing.T) {
-		expectedData, err := ioutil.ReadFile(expectedFilepath)
+		expectedData, err := os.ReadFile(expectedFilepath)
 		assert.NoError(t, err)
 
 		analyser, ok := lexer.(chroma.Analyser)
 		assert.True(t, ok, "lexer %q does not set analyser", lexer.Config().Name)
 
-		data, err := ioutil.ReadFile(actualFilepath)
+		data, err := os.ReadFile(actualFilepath)
 		assert.NoError(t, err)
 
 		actual := analyser.AnalyseText(string(data))