Merge pull request #1328 from akazwz:go

copybara-github · copybara-github · commit 82d3c163cb72 · 2025-10-06T02:29:02.000-07:00
PiperOrigin-RevId: 815626477
diff --git a/go/brotli/go.mod b/go/brotli/go.mod
@@ -1 +1,3 @@
 module github.com/google/brotli/go/brotli
+
+go 1.21
diff --git a/go/brotli/reader.go b/go/brotli/reader.go
@@ -9,7 +9,6 @@ import (
 	"bytes"
 	"errors"
 	"io"
-	"io/ioutil"
 	"strconv"
 	"unsafe"
 )
@@ -127,5 +126,5 @@ func Decode(encodedData []byte) ([]byte, error) {
 func DecodeWithRawDictionary(encodedData []byte, dictionary []byte) ([]byte, error) {
 	r := NewReaderWithOptions(bytes.NewReader(encodedData), ReaderOptions{RawDictionary: dictionary})
 	defer r.Close()
-	return ioutil.ReadAll(r)
+	return io.ReadAll(r)
 }
diff --git a/go/cbrotli/go.mod b/go/cbrotli/go.mod
@@ -1 +1,3 @@
 module github.com/google/brotli/go/cbrotli
+
+go 1.21

Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
`1`	`1`	`module github.com/google/brotli/go/brotli`
	`2`	`+`
	`3`	`+go 1.21`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ import (`
`9`	`9`	`"bytes"`
`10`	`10`	`"errors"`
`11`	`11`	`"io"`
`12`		`- "io/ioutil"`
`13`	`12`	`"strconv"`
`14`	`13`	`"unsafe"`
`15`	`14`	`)`
`@@ -127,5 +126,5 @@ func Decode(encodedData []byte) ([]byte, error) {`
`127`	`126`	`func DecodeWithRawDictionary(encodedData []byte, dictionary []byte) ([]byte, error) {`
`128`	`127`	`r := NewReaderWithOptions(bytes.NewReader(encodedData), ReaderOptions{RawDictionary: dictionary})`
`129`	`128`	`defer r.Close()`
`130`		`- return ioutil.ReadAll(r)`
	`129`	`+ return io.ReadAll(r)`
`131`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
`1`	`1`	`module github.com/google/brotli/go/cbrotli`
	`2`	`+`
	`3`	`+go 1.21`