From 6ba16f05e9c36d4341da4590600eb2c4221ac642 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 21 Aug 2022 12:06:50 -0600 Subject: decode: Lean in to io.RuneScanner So that it's easier to compose your own .DecodeJSON methods, since .DecodeJSON takes an io.RuneScanner. --- decode_scan_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'decode_scan_test.go') diff --git a/decode_scan_test.go b/decode_scan_test.go index 27b60c0..70e2874 100644 --- a/decode_scan_test.go +++ b/decode_scan_test.go @@ -31,7 +31,7 @@ type runeTypeScannerTestcase struct { Exp []ReadRuneTypeResult } -func testRuneTypeScanner(t *testing.T, testcases map[string]runeTypeScannerTestcase, factory func(io.RuneReader) runeTypeScanner) { +func testRuneTypeScanner(t *testing.T, testcases map[string]runeTypeScannerTestcase, factory func(io.RuneScanner) runeTypeScanner) { for tcName, tc := range testcases { t.Run(tcName, func(t *testing.T) { reader := strings.NewReader(tc.Input) @@ -158,7 +158,7 @@ func TestRuneTypeScanner(t *testing.T) { {0, 0, RuneTypeError, &DecodeSyntaxError{Offset: 0, Err: io.EOF}}, }}, } - testRuneTypeScanner(t, testcases, func(reader io.RuneReader) runeTypeScanner { + testRuneTypeScanner(t, testcases, func(reader io.RuneScanner) runeTypeScanner { return &runeTypeScannerImpl{ inner: reader, } @@ -230,7 +230,7 @@ func TestNoWSRuneTypeScanner(t *testing.T) { {0, 0, RuneTypeError, &DecodeSyntaxError{Offset: 2, Err: io.ErrUnexpectedEOF}}, }}, } - testRuneTypeScanner(t, testcases, func(reader io.RuneReader) runeTypeScanner { + testRuneTypeScanner(t, testcases, func(reader io.RuneScanner) runeTypeScanner { return &noWSRuneTypeScanner{ inner: &runeTypeScannerImpl{ inner: reader, @@ -276,7 +276,7 @@ func TestElemRuneTypeScanner(t *testing.T) { }}, } t.Run("top-level", func(t *testing.T) { - testRuneTypeScanner(t, testcases, func(reader io.RuneReader) runeTypeScanner { + testRuneTypeScanner(t, testcases, func(reader io.RuneScanner) runeTypeScanner { return &elemRuneTypeScanner{ inner: &noWSRuneTypeScanner{ inner: &runeTypeScannerImpl{ @@ -297,7 +297,7 @@ func TestElemRuneTypeScanner(t *testing.T) { testcases[tcName] = tc } t.Run("child", func(t *testing.T) { - testRuneTypeScanner(t, testcases, func(reader io.RuneReader) runeTypeScanner { + testRuneTypeScanner(t, testcases, func(reader io.RuneScanner) runeTypeScanner { inner := &noWSRuneTypeScanner{ inner: &runeTypeScannerImpl{ inner: reader, -- cgit v1.2.3-54-g00ecf