Skip to content

Commit bc07165

Browse files
authored
Merge pull request #367 from marwan-at-work/marwan/rmioutil
Remove deprecated ioutil from generator
2 parents da0d7f5 + 7c67b85 commit bc07165

41 files changed

Lines changed: 238 additions & 212 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎clientcompat/gocompat/gocompat.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ package main
1515

1616
import (
1717
"context"
18-
"io/ioutil"
18+
"io"
1919
"log"
2020
"net/http"
2121
"os"
@@ -28,7 +28,7 @@ import (
2828

2929
func main() {
3030
var in clientcompat.ClientCompatMessage
31-
inBytes, err := ioutil.ReadAll(os.Stdin)
31+
inBytes, err := io.ReadAll(os.Stdin)
3232
if err != nil {
3333
log.Fatalf("read stdin err: %v", err)
3434
}

‎clientcompat/internal/clientcompat/clientcompat.pb.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎clientcompat/internal/clientcompat/clientcompat.twirp.go‎

Lines changed: 14 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎example/service.pb.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎example/service.twirp.go‎

Lines changed: 12 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/descriptors/descriptors.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package descriptors
1818
import (
1919
"bytes"
2020
"compress/gzip"
21-
"io/ioutil"
21+
"io"
2222

2323
"google.golang.org/protobuf/proto"
2424
protobuf "google.golang.org/protobuf/types/descriptorpb"
@@ -36,7 +36,7 @@ func UnpackFile(gz []byte) (*protobuf.FileDescriptorProto, error) {
3636
}
3737
defer r.Close()
3838

39-
b, err := ioutil.ReadAll(r)
39+
b, err := io.ReadAll(r)
4040
if err != nil {
4141
return nil, errors.Wrap(err, "failed to uncompress descriptor")
4242
}

‎internal/gen/main.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ package gen
1515

1616
import (
1717
"io"
18-
"io/ioutil"
1918
"os"
2019

2120
"google.golang.org/protobuf/proto"
@@ -50,7 +49,7 @@ Outer:
5049
}
5150

5251
func readGenRequest(r io.Reader) *plugin.CodeGeneratorRequest {
53-
data, err := ioutil.ReadAll(r)
52+
data, err := io.ReadAll(r)
5453
if err != nil {
5554
Error(err, "reading input")
5655
}

‎internal/gen/typemap/typemap_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
package typemap
1515

1616
import (
17-
"io/ioutil"
17+
"os"
1818
"path/filepath"
1919
"testing"
2020

@@ -25,7 +25,7 @@ import (
2525
)
2626

2727
func loadTestPb(t *testing.T) []*descriptor.FileDescriptorProto {
28-
f, err := ioutil.ReadFile(filepath.Join("testdata", "fileset.pb"))
28+
f, err := os.ReadFile(filepath.Join("testdata", "fileset.pb"))
2929
require.NoError(t, err, "unable to read testdata protobuf file")
3030

3131
set := new(descriptor.FileDescriptorSet)

‎internal/twirptest/empty_service/empty_service.pb.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/twirptest/empty_service/empty_service.twirp.go‎

Lines changed: 12 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
⌂ 换网址