diff options
| author |  dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> | 2023-07-10 12:58:06 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-07-10 12:58:06 +0100 |
| commit | a29b5affc87e578987580f22ae57fa719e1f4135 (patch) | |
| tree | 6f5ee39951fe68a9c59fb98e48616ce82e233f70 /vendor/google.golang.org/protobuf/internal/order/order.go | |
| parent | [feature] Use Read/Write lock for config (#1969) (diff) | |
| download | gotosocial-a29b5affc87e578987580f22ae57fa719e1f4135.tar.xz | |
[chore]: Bump golang.org/x/oauth2 from 0.9.0 to 0.10.0 (#1975)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Diffstat (limited to 'vendor/google.golang.org/protobuf/internal/order/order.go')
| -rw-r--r-- | vendor/google.golang.org/protobuf/internal/order/order.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vendor/google.golang.org/protobuf/internal/order/order.go b/vendor/google.golang.org/protobuf/internal/order/order.go index 33745ed06..dea522e12 100644 --- a/vendor/google.golang.org/protobuf/internal/order/order.go +++ b/vendor/google.golang.org/protobuf/internal/order/order.go @@ -33,7 +33,7 @@ var ( return !inOneof(ox) && inOneof(oy) } // Fields in disjoint oneof sets are sorted by declaration index. - if ox != nil && oy != nil && ox != oy { + if inOneof(ox) && inOneof(oy) && ox != oy { return ox.Index() < oy.Index() } // Fields sorted by field number. |