diff options
| author | Wim <wim@42.be> | 2021-06-16 21:00:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-16 21:00:49 +0200 |
| commit | fb5a84212c491332504fcdd4b5f4a4b97705d2e3 (patch) | |
| tree | be03e973d30d040a49a90c47f1e6b73ed8922539 /vendor/google.golang.org/protobuf/proto/messageset.go | |
| parent | dedc1c45a113d8db373d9e4638f54a0f9d29624f (diff) | |
| download | matterbridge-msglm-fb5a84212c491332504fcdd4b5f4a4b97705d2e3.tar.gz matterbridge-msglm-fb5a84212c491332504fcdd4b5f4a4b97705d2e3.tar.bz2 matterbridge-msglm-fb5a84212c491332504fcdd4b5f4a4b97705d2e3.zip | |
Update dependencies (#1521)
Diffstat (limited to 'vendor/google.golang.org/protobuf/proto/messageset.go')
| -rw-r--r-- | vendor/google.golang.org/protobuf/proto/messageset.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/vendor/google.golang.org/protobuf/proto/messageset.go b/vendor/google.golang.org/protobuf/proto/messageset.go index 1d692c3a..312d5d45 100644 --- a/vendor/google.golang.org/protobuf/proto/messageset.go +++ b/vendor/google.golang.org/protobuf/proto/messageset.go @@ -9,6 +9,7 @@ import ( "google.golang.org/protobuf/internal/encoding/messageset" "google.golang.org/protobuf/internal/errors" "google.golang.org/protobuf/internal/flags" + "google.golang.org/protobuf/internal/order" "google.golang.org/protobuf/reflect/protoreflect" "google.golang.org/protobuf/reflect/protoregistry" ) @@ -28,8 +29,12 @@ func (o MarshalOptions) marshalMessageSet(b []byte, m protoreflect.Message) ([]b if !flags.ProtoLegacy { return b, errors.New("no support for message_set_wire_format") } + fieldOrder := order.AnyFieldOrder + if o.Deterministic { + fieldOrder = order.NumberFieldOrder + } var err error - o.rangeFields(m, func(fd protoreflect.FieldDescriptor, v protoreflect.Value) bool { + order.RangeFields(m, fieldOrder, func(fd protoreflect.FieldDescriptor, v protoreflect.Value) bool { b, err = o.marshalMessageSetField(b, fd, v) return err == nil }) |