Modernize

render/context.go

@@ -3,7 +3,6 @@ package render
 import (
 	"bytes"
 	"io"
-	"io/ioutil"
 	"os"
 	"strings"
 
@@ -147,7 +146,7 @@ func (c rendererContext) RenderChildren(w io.Writer) Error {
 }
 
 func (c rendererContext) RenderFile(filename string, b map[string]interface{}) (string, error) {
-	source, err := ioutil.ReadFile(filename)
+	source, err := os.ReadFile(filename)
 	if err != nil && os.IsNotExist(err) {
 		// Is it cached?
 		if cval, ok := c.ctx.config.Cache[filename]; ok {

render/context_test.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"testing"
 
@@ -123,7 +122,7 @@ func TestContext_errors(t *testing.T) {
 		t.Run(fmt.Sprintf("%02d", i+1), func(t *testing.T) {
 			root, err := cfg.Compile(test.in, parser.SourceLoc{})
 			require.NoErrorf(t, err, test.in)
-			err = Render(root, ioutil.Discard, contextTestBindings, cfg)
+			err = Render(root, io.Discard, contextTestBindings, cfg)
 			require.Errorf(t, err, test.in)
 			require.Containsf(t, err.Error(), test.expect, test.in)
 		})
@@ -140,7 +139,7 @@ func TestContext_file_not_found_error(t *testing.T) {
 	addContextTestTags(cfg)
 	root, err := cfg.Compile(`{% test_render_file testdata/missing_file %}`, parser.SourceLoc{})
 	require.NoError(t, err)
-	err = Render(root, ioutil.Discard, contextTestBindings, cfg)
+	err = Render(root, io.Discard, contextTestBindings, cfg)
 	require.Error(t, err)
 	require.True(t, os.IsNotExist(err.Cause()))
 }

render/render_test.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"testing"
 	"time"
 
@@ -121,7 +120,7 @@ func TestRenderErrors(t *testing.T) {
 		t.Run(fmt.Sprintf("%02d", i+1), func(t *testing.T) {
 			root, err := cfg.Compile(test.in, parser.SourceLoc{})
 			require.NoErrorf(t, err, test.in)
-			err = Render(root, ioutil.Discard, renderTestBindings, cfg)
+			err = Render(root, io.Discard, renderTestBindings, cfg)
 			require.Errorf(t, err, test.in)
 			require.Containsf(t, err.Error(), test.out, test.in)
 		})

tags/control_flow_tags_test.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"testing"
 
 	"github.com/osteele/liquid/parser"
@@ -94,7 +93,7 @@ func TestControlFlowTags_errors(t *testing.T) {
 		t.Run(fmt.Sprintf("%02d", i+1), func(t *testing.T) {
 			root, err := cfg.Compile(test.in, parser.SourceLoc{})
 			require.NoErrorf(t, err, test.in)
-			err = render.Render(root, ioutil.Discard, tagTestBindings, cfg)
+			err = render.Render(root, io.Discard, tagTestBindings, cfg)
 			require.Errorf(t, err, test.in)
 			require.Contains(t, err.Error(), test.expected, test.in)
 		})

tags/include_tag_test.go

@@ -2,7 +2,7 @@ package tags
 
 import (
 	"bytes"
-	"io/ioutil"
+	"io"
 	"os"
 	"strings"
 	"testing"
@@ -41,7 +41,7 @@ func TestIncludeTag(t *testing.T) {
 	// errors
 	root, err = config.Compile(`{% include 10 %}`, loc)
 	require.NoError(t, err)
-	err = render.Render(root, ioutil.Discard, includeTestBindings, config)
+	err = render.Render(root, io.Discard, includeTestBindings, config)
 	require.Error(t, err)
 	require.Contains(t, err.Error(), "requires a string")
 }
@@ -54,7 +54,7 @@ func TestIncludeTag_file_not_found_error(t *testing.T) {
 	// See the comment in TestIncludeTag_file_not_found_error.
 	root, err := config.Compile(`{% include "missing_file.html" %}`, loc)
 	require.NoError(t, err)
-	err = render.Render(root, ioutil.Discard, includeTestBindings, config)
+	err = render.Render(root, io.Discard, includeTestBindings, config)
 	require.Error(t, err)
 	require.True(t, os.IsNotExist(err.Cause()))
 }

tags/iteration_tags_test.go

@@ -3,7 +3,7 @@ package tags
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"regexp"
 	"strings"
 	"testing"
@@ -183,7 +183,7 @@ func TestIterationTags_errors(t *testing.T) {
 		t.Run(fmt.Sprintf("%02d", i+1+len(iterationSyntaxErrorTests)), func(t *testing.T) {
 			root, err := cfg.Compile(test.in, parser.SourceLoc{})
 			require.NoErrorf(t, err, test.in)
-			err = render.Render(root, ioutil.Discard, iterationTestBindings, cfg)
+			err = render.Render(root, io.Discard, iterationTestBindings, cfg)
 			require.Errorf(t, err, test.in)
 			require.Containsf(t, err.Error(), test.expected, test.in)
 		})

tags/standard_tags_test.go

@@ -3,7 +3,7 @@ package tags
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"testing"
 
 	"github.com/osteele/liquid/parser"
@@ -101,7 +101,7 @@ func TestStandardTags_render_errors(t *testing.T) {
 		t.Run(fmt.Sprintf("%02d", i+1), func(t *testing.T) {
 			root, err := config.Compile(test.in, parser.SourceLoc{})
 			require.NoErrorf(t, err, test.in)
-			err = render.Render(root, ioutil.Discard, tagTestBindings, config)
+			err = render.Render(root, io.Discard, tagTestBindings, config)
 			require.Errorf(t, err, test.in)
 			require.Containsf(t, err.Error(), test.expected, test.in)
 		})