Skip to content

Move parser helpers to shared module#44

Merged
leynos merged 4 commits intomainfrom
codex/move-utility-functions-to-shared-module
Jul 4, 2025
Merged

Move parser helpers to shared module#44
leynos merged 4 commits intomainfrom
codex/move-utility-functions-to-shared-module

Conversation

@leynos
Copy link
Copy Markdown
Owner

@leynos leynos commented Jul 4, 2025

Summary

  • extract parse_name_type_pairs and parse_type_after_colon into parser::ast::parse_utils
  • update docs to mention the new module

Testing

  • make fmt
  • make lint
  • make test
  • make markdownlint

https://chatgpt.com/codex/tasks/task_e_68672090250c8322a4513a9d4ad9c234

Summary by Sourcery

Extract parse_name_type_pairs and parse_type_after_colon into a shared parse_utils module and update parser and docs to use it

Enhancements:

  • Move name/type parsing helpers out of inline definitions into parser::ast::parse_utils for reuse
  • Expose skip_whitespace_and_comments at pub(super) scope to support the new utility module

Documentation:

  • Update function-parsing-design.md to reference the new parser::ast::parse_utils module

Tests:

  • Add unit tests for parse_name_type_pairs and parse_type_after_colon in parse_utils

@sourcery-ai
Copy link
Copy Markdown
Contributor

sourcery-ai Bot commented Jul 4, 2025

Reviewer's Guide

This PR centralizes the parser helper routines into a new shared parser::ast::parse_utils module, removes their original definitions from mod.rs, adjusts visibility and imports, and updates documentation to point at the new location.

Class diagram for parser helper refactor to parse_utils module

classDiagram
    class parse_utils {
        +parse_name_type_pairs<I>(iter: I) Vec<(String, String)>
        +parse_type_after_colon<I>(iter: &mut Peekable<I>) Option<String>
    }
    class ast {
        +skip_whitespace_and_comments<I>(iter: &mut Peekable<I>)
    }
    ast <.. parse_utils : uses
Loading

Class diagram for updated parser::ast module imports

classDiagram
    class ast {
        +skip_whitespace_and_comments<I>(iter: &mut Peekable<I>)
        +parse_name_type_pairs<I>(iter: I) Vec<(String, String)>
        +parse_type_after_colon<I>(iter: &mut Peekable<I>) Option<String>
    }
    class parse_utils {
        +parse_name_type_pairs<I>(iter: I) Vec<(String, String)>
        +parse_type_after_colon<I>(iter: &mut Peekable<I>) Option<String>
    }
    ast ..> parse_utils : imports
Loading

File-Level Changes

Change Details Files
Modularize and relocate parser helper functions into a shared utility module
  • Created new parse_utils.rs under src/parser/ast/ with parse_name_type_pairs, parse_type_after_colon, and visibility-adjusted skip_whitespace_and_comments
  • Removed these helper implementations from src/parser/mod.rs
  • Added mod parse_utils; and use parse_utils::{parse_name_type_pairs, parse_type_after_colon}; in mod.rs
  • Included unit tests for the helpers in parse_utils.rs
src/parser/mod.rs
src/parser/ast/parse_utils.rs
Update documentation to reference the new shared module
  • Changed docs/function-parsing-design.md to mention parser::ast::parse_utils instead of inline helper descriptions
docs/function-parsing-design.md

Possibly linked issues


Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Jul 4, 2025

Warning

Rate limit exceeded

@leynos has exceeded the limit for the number of commits or files that can be reviewed per hour. Please wait 5 minutes and 36 seconds before requesting another review.

⌛ How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

📥 Commits

Reviewing files that changed from the base of the PR and between aaf3fd5 and 6fc710b.

📒 Files selected for processing (1)
  • src/parser/ast/parse_utils.rs (1 hunks)

Summary by CodeRabbit

  • Documentation

    • Updated documentation to clarify the shared location of parsing helper functions for parameter lists and return types.
  • Refactor

    • Moved parsing utility functions to a dedicated shared module for improved code organisation and reuse.
  • Tests

    • Added unit tests to verify correct parsing of name-type pairs and return types, including complex and edge cases.

Summary by CodeRabbit

  • Documentation

    • Updated documentation to clarify the location and reuse of parsing helper functions for parameter lists and return types.
  • Refactor

    • Moved shared parsing utilities for extracting parameter/type pairs and type annotations into a dedicated module for improved code organisation. No changes to user-facing behaviour.

Walkthrough

The changes introduce a new parse_utils module under src/parser/ast/ to house shared parsing helper functions for AST construction. The functions parse_name_type_pairs and parse_type_after_colon are moved from their previous location and now imported from this module. Documentation is updated to reflect this refactor.

Changes

File(s) Change Summary
docs/function-parsing-design.md Updated documentation to specify that parsing helpers are now in parser::ast::parse_utils and reused by Function/Relation.
src/parser/ast/parse_utils.rs New module with parse_name_type_pairs and parse_type_after_colon functions for shared AST parsing logic.
src/parser/mod.rs Removed inline helper functions, imported them from parse_utils, and adjusted visibility of skip_whitespace_and_comments.

Sequence Diagram(s)

sequenceDiagram
    participant Parser
    participant ParseUtils

    Parser->>ParseUtils: parse_name_type_pairs(iterator)
    ParseUtils-->>Parser: Vec<(String, String)>

    Parser->>ParseUtils: parse_type_after_colon(peekable_iterator)
    ParseUtils-->>Parser: Option<String>
Loading

Possibly related PRs

  • Implement function parser #40: Originally introduced and used the helper functions for parsing function and relation AST nodes, which are now refactored into a shared module in this PR.

Poem

In the warren of code, helpers now unite,
Parsing names and types, both day and night.
From scattered fields to a single home,
parse_utils leads, no more to roam!
Functions and relations, paws in sync,
A rabbit’s refactor—cleaner than you think!
🐇✨

✨ Finishing Touches
  • 📝 Generate Docstrings
🧪 Generate Unit Tests
  • Create PR with Unit Tests
  • Post Copyable Unit Tests in a Comment
  • Commit Unit Tests in branch codex/move-utility-functions-to-shared-module

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai auto-generate unit tests to generate unit tests for this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Copy Markdown
Contributor

@sourcery-ai sourcery-ai Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @leynos - I've reviewed your changes and they look great!


Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

Repository owner deleted a comment from coderabbitai Bot Jul 4, 2025
@leynos
Copy link
Copy Markdown
Owner Author

leynos commented Jul 4, 2025

@coderabbitai review

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Jul 4, 2025

✅ Actions performed

Review triggered.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

@leynos
Copy link
Copy Markdown
Owner Author

leynos commented Jul 4, 2025

@coderabbitai review

@leynos
Copy link
Copy Markdown
Owner Author

leynos commented Jul 4, 2025

@sourcery-ai review

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Jul 4, 2025

✅ Actions performed

Review triggered.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

Copy link
Copy Markdown
Contributor

@sourcery-ai sourcery-ai Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @leynos - I've reviewed your changes and they look great!

Prompt for AI Agents
Please address the comments from this code review:
## Individual Comments

### Comment 1
<location> `src/parser/ast/parse_utils.rs:109` </location>
<code_context>
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
</code_context>

<issue_to_address>
Test setup code is duplicated instead of using an `rstest` fixture for shared setup.

The helper functions `tokens_for` and `return_type_for` are used in multiple tests, but are not implemented as `rstest` fixtures. Consider refactoring these into fixtures to promote reuse and clarity as per the review instructions.
</issue_to_address>

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

}
}

#[cfg(test)]
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion (review_instructions): Test setup code is duplicated instead of using an rstest fixture for shared setup.

The helper functions tokens_for and return_type_for are used in multiple tests, but are not implemented as rstest fixtures. Consider refactoring these into fixtures to promote reuse and clarity as per the review instructions.

Review instructions:

Path patterns: **/*.rs

Instructions:
Use rstest fixtures for shared setup.

Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

📜 Review details

Configuration used: CodeRabbit UI
Review profile: ASSERTIVE
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 9178c08 and aaf3fd5.

📒 Files selected for processing (1)
  • src/parser/ast/parse_utils.rs (1 hunks)
🧰 Additional context used
📓 Path-based instructions (1)
`**/*.rs`: * Seek to keep the cyclomatic complexity of functions no more than 12...

**/*.rs: * Seek to keep the cyclomatic complexity of functions no more than 12.

  • Adhere to single responsibility and CQRS

  • Place function attributes after doc comments.

  • Do not use return in single-line functions.

  • Move conditionals with >2 branches into a predicate function.

  • Avoid unsafe unless absolutely necessary.

  • Every module must begin with a //! doc comment that explains the module's purpose and utility.

  • Comments must use en-GB-oxendict spelling and grammar.

  • Lints must not be silenced except as a last resort.

    • #[allow] is forbidden.
    • Only narrowly scoped #[expect(lint, reason = "...")] is allowed.
    • No lint groups, no blanket or file-wide suppression.
    • Include FIXME: with link if a fix is expected.
  • Use rstest fixtures for shared setup and to avoid repetition between tests.

  • Replace duplicated tests with #[rstest(...)] parameterised cases.

  • Prefer mockall for mocks/stubs.

  • Prefer .expect() over .unwrap()

  • Ensure that any API or behavioural changes are reflected in the documentation in docs/

  • Ensure that any completed roadmap steps are recorded in the appropriate roadmap in docs/

⚙️ Source: CodeRabbit Configuration File

List of files the instruction was applied to:

  • src/parser/ast/parse_utils.rs
🔇 Additional comments (5)
src/parser/ast/parse_utils.rs (5)

1-5: Excellent module documentation.

The module documentation properly follows the coding guidelines with a //! doc comment that clearly explains the module's purpose and utility.


74-107: Function design follows coding guidelines well.

The parse_type_after_colon function has appropriate complexity, proper use of #[must_use], and handles edge cases correctly. The early return pattern and error handling are well implemented.


115-116: Proper use of #[expect] with reasoning.

Good adherence to the coding guidelines by using #[expect] instead of #[allow] with a clear reason for the lint suppression.


155-168: Excellent use of rstest parameterised tests.

The tests properly use #[rstest] with parameterised cases as recommended in the coding guidelines. The test cases cover various scenarios including edge cases like missing colons and nested types.


170-178: Comprehensive test coverage for trailing type parsing.

The test cases cover both positive and negative scenarios, including edge cases like newlines and empty types, ensuring robust validation of the parsing logic.

Comment thread src/parser/ast/parse_utils.rs
@leynos leynos merged commit 3a9eebd into main Jul 4, 2025
2 checks passed
@leynos leynos deleted the codex/move-utility-functions-to-shared-module branch July 4, 2025 07:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant