diff options
| author |  dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> | 2024-08-19 10:13:46 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2024-08-19 10:13:46 +0000 |
| commit | 6ff8376d96f094daacf62decf2ee7ff602c2d531 (patch) | |
| tree | 0b0ad45951ef1aae841384fd550e01b44f4cba76 /vendor/google.golang.org/protobuf/internal/filedesc/desc_lazy.go | |
| parent | [bugfix] permit unspecified orientation data (#3205) (diff) | |
| download | gotosocial-6ff8376d96f094daacf62decf2ee7ff602c2d531.tar.xz | |
[chore]: Bump github.com/prometheus/client_golang from 1.19.1 to 1.20.0 (#3210)
Diffstat (limited to 'vendor/google.golang.org/protobuf/internal/filedesc/desc_lazy.go')
| -rw-r--r-- | vendor/google.golang.org/protobuf/internal/filedesc/desc_lazy.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/vendor/google.golang.org/protobuf/internal/filedesc/desc_lazy.go b/vendor/google.golang.org/protobuf/internal/filedesc/desc_lazy.go index 570181eb4..e56c91a8d 100644 --- a/vendor/google.golang.org/protobuf/internal/filedesc/desc_lazy.go +++ b/vendor/google.golang.org/protobuf/internal/filedesc/desc_lazy.go @@ -45,6 +45,11 @@ func (file *File) resolveMessages() { case protoreflect.MessageKind, protoreflect.GroupKind: fd.L1.Message = file.resolveMessageDependency(fd.L1.Message, listFieldDeps, depIdx) depIdx++ + if fd.L1.Kind == protoreflect.GroupKind && (fd.IsMap() || fd.IsMapEntry()) { + // A map field might inherit delimited encoding from a file-wide default feature. + // But maps never actually use delimited encoding. (At least for now...) + fd.L1.Kind = protoreflect.MessageKind + } } // Default is resolved here since it depends on Enum being resolved. |