fix(sol-macro): bug fixes #372
Merged
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
DaniPopes
commented
Oct 15, 2023
| @@ -314,7 +314,7 @@ impl<'a> CallLikeExpander<'a> { | |||
| .map(Self::#variants) | |||
| })* | |||
| s => ::core::result::Result::Err(::alloy_sol_types::Error::unknown_selector( | |||
| Self::NAME, | |||
| <Self as ::alloy_sol_types::SolInterface>::NAME, | |||
There was a problem hiding this comment.
Part of issue #361
expected reference &'static str found enum constructor
this triggered because Self::NAME resolved first as the variant vs the trait constant
Comment on lines
-30
to
+31
| const RESOLVE_LIMIT: usize = 8; | ||
| const RESOLVE_LIMIT: usize = 32; |
| pub fn expand(ast: File) -> Result<TokenStream> { | ||
| ExpCtxt::new(&ast).expand() | ||
| } | ||
|
|
||
| /// The expansion context. | ||
| struct ExpCtxt<'ast> { | ||
| all_items: Vec<&'ast Item>, | ||
| custom_types: HashMap<SolIdent, Type>, | ||
| custom_types: IndexMap<SolIdent, Type>, |
There was a problem hiding this comment.
IndexMap lets us have deterministic iteration and thus output (errors etc).
Comment on lines
+613
to
+614
| .enumerate() | ||
| .filter(|(_, p)| !p.is_indexed()) |
There was a problem hiding this comment.
#361 title error - enumerate before filter
Comment on lines
+402
to
+405
| // trailing comma for single-element tuples | ||
| if components.len() == 1 { | ||
| out.push(','); | ||
| } |
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.
Motivation
Fixes #360
Fixes #361
Fixes #371
Solution
PR Checklist