better checking of tag duplicates, avoid discarding invalid variant errs #951
Conversation
This file contains 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
mumbleskates
commented
Nov 25, 2023
Comment on lines
-421
to
-425
| bail!( | ||
| "invalid oneof variant {}::{}: oneof variants may only have a single tag", | ||
| ident, | ||
| variant_ident | ||
| ); |
There was a problem hiding this comment.
the Err this returns is formerly always discarded via flattening the Result. it doesn't hurt to retain the check even though i've not been able to find a way to trigger it, but if the condition does somehow occur it should actually stop the macro.
There was a problem hiding this comment.
i believe the intention here was originally to write this as .map(..).collect::<Result<Vec<_>, _>>()?;, but the nuance was lost
mumbleskates
force-pushed
the
deduping
branch
from
2738cac
to
31aa6de
Compare
mumbleskates
force-pushed
the
deduping
branch
from
31aa6de
to
b30f84b
Compare
mumbleskates
commented
Nov 25, 2023
Comment on lines
+96
to
+98
| .sorted_unstable() | ||
| .tuple_windows() | ||
| .find(|(a, b)| a == b) |
There was a problem hiding this comment.
it would kinda be preferable to write this as .duplicates().next() using Itertools, but that method unfortunately requires use_std.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Currently it seems that the "invalid oneof variant" Errs are always discarded because they are being passed directly into
flat_mapfrom a closure, rather than actually propagating the error.This PR also streamlines the checks for duplicated tag numbers and adds some rudimentary tests for the affected code in those proc macros.