Merge pull request #367 from marwan-at-work/marwan/rmioutil

Remove deprecated ioutil from generator
twitchtv · Sep 19, 2022 · bc07165 · bc07165
2 parents da0d7f5 + 7c67b85
commit bc07165
Show file tree

Hide file tree

Showing 41 changed files with 238 additions and 212 deletions.
diff --git a/clientcompat/gocompat/gocompat.go b/clientcompat/gocompat/gocompat.go
@@ -15,7 +15,7 @@ package main
 
 import (
 	"context"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 	"os"
@@ -28,7 +28,7 @@ import (
 
 func main() {
 	var in clientcompat.ClientCompatMessage
-	inBytes, err := ioutil.ReadAll(os.Stdin)
+	inBytes, err := io.ReadAll(os.Stdin)
 	if err != nil {
 		log.Fatalf("read stdin err: %v", err)
 	}

diff --git a/clientcompat/internal/clientcompat/clientcompat.pb.go b/clientcompat/internal/clientcompat/clientcompat.pb.go
diff --git a/clientcompat/internal/clientcompat/clientcompat.twirp.go b/clientcompat/internal/clientcompat/clientcompat.twirp.go
diff --git a/example/service.pb.go b/example/service.pb.go
diff --git a/example/service.twirp.go b/example/service.twirp.go
diff --git a/internal/descriptors/descriptors.go b/internal/descriptors/descriptors.go
@@ -18,7 +18,7 @@ package descriptors
 import (
 	"bytes"
 	"compress/gzip"
-	"io/ioutil"
+	"io"
 
 	"google.golang.org/protobuf/proto"
 	protobuf "google.golang.org/protobuf/types/descriptorpb"
@@ -36,7 +36,7 @@ func UnpackFile(gz []byte) (*protobuf.FileDescriptorProto, error) {
 	}
 	defer r.Close()
 
-	b, err := ioutil.ReadAll(r)
+	b, err := io.ReadAll(r)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to uncompress descriptor")
 	}

diff --git a/internal/gen/main.go b/internal/gen/main.go
@@ -15,7 +15,6 @@ package gen
 
 import (
 	"io"
-	"io/ioutil"
 	"os"
 
 	"google.golang.org/protobuf/proto"
@@ -50,7 +49,7 @@ Outer:
 }
 
 func readGenRequest(r io.Reader) *plugin.CodeGeneratorRequest {
-	data, err := ioutil.ReadAll(r)
+	data, err := io.ReadAll(r)
 	if err != nil {
 		Error(err, "reading input")
 	}

diff --git a/internal/gen/typemap/typemap_test.go b/internal/gen/typemap/typemap_test.go
@@ -14,7 +14,7 @@
 package typemap
 
 import (
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"testing"
 
@@ -25,7 +25,7 @@ import (
 )
 
 func loadTestPb(t *testing.T) []*descriptor.FileDescriptorProto {
-	f, err := ioutil.ReadFile(filepath.Join("testdata", "fileset.pb"))
+	f, err := os.ReadFile(filepath.Join("testdata", "fileset.pb"))
 	require.NoError(t, err, "unable to read testdata protobuf file")
 
 	set := new(descriptor.FileDescriptorSet)

diff --git a/internal/twirptest/empty_service/empty_service.pb.go b/internal/twirptest/empty_service/empty_service.pb.go
diff --git a/internal/twirptest/empty_service/empty_service.twirp.go b/internal/twirptest/empty_service/empty_service.twirp.go
diff --git a/internal/twirptest/google_protobuf_imports/service.pb.go b/internal/twirptest/google_protobuf_imports/service.pb.go