diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-07-29 17:31:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-29 17:31:32 +0200 |
| commit | 1ea3686600eada7e24e352359e9b76ece1c0bae2 (patch) | |
| tree | 04bd7464360d0c7cd76ace1cd6f953c1c939cb20 /vendor/google.golang.org/protobuf/proto/encode.go | |
| parent | 6e86e572439c0cbbeac5be48d19fbc74e6f31d87 (diff) | |
| parent | 49bcb7eaa0f3dd14aee629ac0ce8a4e67b954f00 (diff) | |
| download | podman-1ea3686600eada7e24e352359e9b76ece1c0bae2.tar.gz podman-1ea3686600eada7e24e352359e9b76ece1c0bae2.tar.bz2 podman-1ea3686600eada7e24e352359e9b76ece1c0bae2.zip | |
Merge pull request #15116 from containers/dependabot/go_modules/google.golang.org/protobuf-1.28.1
Bump google.golang.org/protobuf from 1.28.0 to 1.28.1
Diffstat (limited to 'vendor/google.golang.org/protobuf/proto/encode.go')
| -rw-r--r-- | vendor/google.golang.org/protobuf/proto/encode.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vendor/google.golang.org/protobuf/proto/encode.go b/vendor/google.golang.org/protobuf/proto/encode.go index d18239c23..bf7f816d0 100644 --- a/vendor/google.golang.org/protobuf/proto/encode.go +++ b/vendor/google.golang.org/protobuf/proto/encode.go @@ -16,7 +16,8 @@ import ( // MarshalOptions configures the marshaler. // // Example usage: -// b, err := MarshalOptions{Deterministic: true}.Marshal(m) +// +// b, err := MarshalOptions{Deterministic: true}.Marshal(m) type MarshalOptions struct { pragma.NoUnkeyedLiterals @@ -101,7 +102,9 @@ func (o MarshalOptions) Marshal(m Message) ([]byte, error) { // otherwise it returns a non-nil empty buffer. // // This is to assist the edge-case where user-code does the following: +// // m1.OptionalBytes, _ = proto.Marshal(m2) +// // where they expect the proto2 "optional_bytes" field to be populated // if any only if m2 is a valid message. func emptyBytesForMessage(m Message) []byte { |