Repository navigation
Reject oneofs whose member fields are not declared consecutively - #688
Merged
iainmcgin merged 1 commit intoOct 12, 2026
Merged
Conversation
|
All contributors have signed the CLA ✍️ ✅ |
iainmcgin
approved these changes
Oct 12, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
DescriptorPoolnow rejects a oneof whose members are separated in declaration order by a field outside that oneof. This matches protoc's requirement that members of the same oneof be declared consecutively.The check lives beside the existing empty-oneof validation and returns
PoolError::NonconsecutiveOneofFields. It checks declaration order, not field numbers: adjacent members with nonconsecutive or unsorted numbers remain valid. Code generation and codecs are unchanged.This affects hand-built or synthesized descriptor sets. Normal protoc-generated descriptors already follow the rule.
Fixes #636.
Testing
pool_e2etests pass with the fix.task lintandtask testpass with the pinned Rust toolchain and protoc 33.5.Includes a changelog fragment. No generated code changes.