Try harder to disambiguate enum variant identifiers #762
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
There was a problem hiding this comment.
I did test this (patching it into Omicron w/ typify/progenitor) and it does solve the current issue in relation to dendrite integration: https://github.com/oxidecomputer/omicron/actions/runs/13082114024/job/36507633179?pr=6918#step:11:644.
|
|
||
| // If variants still aren't unique, we fail: we'd rather not emit code | ||
| // that can't compile | ||
| if !variants_unique(&variants) { |
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.
Previously, conversion from the variant name derived from the schema and the Rust identifier was done for each variant as it was constructed. This change defers that conversion to when we construct the enum (i.e. when we have all variants in hand). This then allows us to check that each variant has a unique name, and try an alternative conversion. This also lets us fail rather than generating code that does not compile.
There's much more we could do to improve name generation, but this is a decent step forward both in terms of organization and resolving an immediate use case.