fix: frov hoisting bug #10
Open
Conversation
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
this mitigates the case where inconsistencies between the logic in `collect_helpers` and `collect_tests` caused setup hooks to be invoked but not defined, as was the trigger for this PR. This also mean we will generate more helpers, as we'll now generate them when there's no real need for reuse of their logic, as exemplified in the previous commit
wei3erHase
reviewed
Jan 6, 2026
zkfrov
approved these changes
Jan 8, 2026
zkfrov
left a comment
zkfrov
left a comment
There was a problem hiding this comment.
Everything is working like a charm now. Tested with the full Token tree and all functions are generated and included in their corresponding mods!
Left a small suggestion.
Comment on lines
+72
to
+76
| if generate_setup_hooks { | ||
| for import in &self.imported_hooks { | ||
| output.push_str(format!(" use super::{};\n", import.name).as_str()); | ||
| } | ||
| } |
There was a problem hiding this comment.
Nice to have: pack super imports in the mods, this
use super::{
when_shares_are_held,
when_called_on_behalf_of_other_with_authwit
};
instead of the current behaviour
use super::when_shares_are_held;
use super::when_called_on_behalf_of_other_with_authwit;
That was generated with this change
Suggested change
| if generate_setup_hooks { | |
| for import in &self.imported_hooks { | |
| output.push_str(format!(" use super::{};\n", import.name).as_str()); | |
| } | |
| } | |
| if generate_setup_hooks && !self.imported_hooks.is_empty() { | |
| if self.imported_hooks.len() == 1 { | |
| output.push_str(format!(" use super::{};\n", self.imported_hooks[0].name).as_str()); | |
| } else { | |
| output.push_str(" use super::{\n"); | |
| for (i, import) in self.imported_hooks.iter().enumerate() { | |
| output.push_str(&format!(" {}", import.name)); | |
| if i < self.imported_hooks.len() - 1 { | |
| output.push_str(",\n"); | |
| } else { | |
| output.push('\n'); | |
| } | |
| } | |
| output.push_str(" };\n"); | |
| } | |
| output.push('\n'); | |
| } |
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.
see git history for details