8000 proto: use fixed UnmarshalState API · golang/protobuf@7bd8073 · GitHub < 8000 /head>
[go: up one dir, main page]
Skip to content

Commit 7bd8073

Browse files
dsnetdsnet
committed
proto: use fixed UnmarshalState API
Change-Id: I08abfaed1bafd0d650988883be31faefbd312331 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/222679 Reviewed-by: Damien Neil <dneil@google.com>
1 parent 3f90b72 commit 7bd8073

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ go 1.9
44

55
require (
66
github.com/google/go-cmp v0.4.0
7-
google.golang.org/protobuf v1.20.0
7+
google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967
88
)

‎go.sum

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IV
99
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
1010
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
1111
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
12-
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60 h1:qkfzMNEf79BNs1//mQGZjYHIXAOv+AOdvPnMsU6R+1I=
1312
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
14-
google.golang.org/protobuf v1.20.0 h1:SsQNHvKpk2VTiWoQ5Pqkt3Go/c2ly77C+v2Lggu5Qek=
15-
google.golang.org/protobuf v1.20.0/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
13+
google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967 h1:DwkfSP6tZMxKX50J0dBSqEgJvJdFYP1Gvzbjtvkmrug=
14+
google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=

‎proto/wire.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,9 @@ func UnmarshalMerge(b []byte, m Message) error {
6464
out, err := protoV2.UnmarshalOptions{
6565
AllowPartial: true,
6666
Merge: true,
67-
}.UnmarshalState(mi, protoiface.UnmarshalInput{
68-
Buf: b,
67+
}.UnmarshalState(protoiface.UnmarshalInput{
68+
Buf: b,
69+
Message: mi.ProtoReflect(),
6970
})
7071
if err != nil {
7172
return err

0 commit comments

Comments
 (0)
0