diff options
| author | Wim <wim@42.be> | 2022-08-13 16:14:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-13 16:14:26 +0200 |
| commit | 6a3fc713978a0c1c9290a4afd08b47886b49b635 (patch) | |
| tree | aa62cd85cf5671646c75ee38b3fc140ef7edcea8 /vendor/google.golang.org/protobuf/proto/encode.go | |
| parent | 3c4192ebf6a32e30cdd23a9644c2ceca72a006fa (diff) | |
| download | matterbridge-msglm-6a3fc713978a0c1c9290a4afd08b47886b49b635.tar.gz matterbridge-msglm-6a3fc713978a0c1c9290a4afd08b47886b49b635.tar.bz2 matterbridge-msglm-6a3fc713978a0c1c9290a4afd08b47886b49b635.zip | |
Update dependencies and go1.18 (#1873)
* Update dependencies and go1.18
* Exclude unnecessary linters and update build to go1.18
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 d18239c2..bf7f816d 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 { |