Integrate the new Rust ArgSplitter. #21824
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
benjyw
commented
Jan 11, 2025
| @@ -188,73 +114,25 @@ def add_goal(scope: str) -> str: | |||
| f"The {si.deprecated_scope} goal was renamed to {si.subsystem_cls.options_scope}", | |||
| ) | |||
|
|
|||
| if (si.is_builtin or si.is_auxiliary) and ( | |||
There was a problem hiding this comment.
The Rust side doesn't (yet) know about builtin or auxiliary goals, so we need this logic here. Note that it's copied directly from the deleted block above.
benjyw
commented
Jan 11, 2025
| @@ -65,49 +64,6 @@ def assert_unknown_goal(splitter: ArgSplitter, args_str: str, unknown_goals: lis | |||
| assert set(unknown_goals) == set(split_args.unknown_goals) | |||
|
|
|||
|
|
|||
| def test_is_spec(tmp_path: Path, splitter: ArgSplitter, known_scope_infos: list[ScopeInfo]) -> None: | |||
There was a problem hiding this comment.
This test was ported to Rust, and since we no longer need a Python likely_a_spec() method, we also don't need to test it separately.
benjyw
commented
Jan 11, 2025
| builtin_or_auxiliary_goal: str | None = None | ||
| canonical_goals = [] | ||
| for goal in native_split_args.goals(): |
There was a problem hiding this comment.
Rust returns a string-valued goal name, here we get a ScopeInfo instance for it.
tdyas
approved these changes
Jan 11, 2025
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.
Replaces the implementation of the Python ArgSplitter
with a call to the Rust one.
But the Python ArgSplitter class still exists (for now)
as a thin wrapper, primarily to show that its tests
still pass.
A future change may rip it out entirely and call
ArgSplitter exclusively from other Rust code.