Clean up code in flow-filter table management#1268
Merged
Conversation
Drive-by cleanup. No need to check that the count for filtered elements is strictly positive; just use the .any() iterator method with the condition. Signed-off-by: Quentin Monnet <qmo@qmon.net>
Consolidate the duplicated AllPorts/Ranges enum pattern from SrcConnectionData and RemotePortRangesData into a single generic PortRangeMap<T> type. This eliminates ~40 lines of duplicate code for the ValueWithAssociatedRanges trait implementation and the new/get methods. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> Signed-off-by: Quentin Monnet <qmo@qmon.net>
Replace the repeated get-or-insert pattern in the four insert methods with a single get_or_create_table helper using HashMap's entry API. This removes ~40 lines of duplicated boilerplate code. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> Signed-off-by: Quentin Monnet <qmo@qmon.net>
Replace create_default_source and create_default_source_to_default_remote with a single set_default_source helper that handles the guard logic. The update_* methods now construct the data inline and call the helper. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> Signed-off-by: Quentin Monnet <qmo@qmon.net>
Rename default_source_opt to default_source for consistency with default_remote_data. The Option type already indicates optionality. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> Signed-off-by: Quentin Monnet <qmo@qmon.net>
Rewrite the structural comment to clearly explain the lookup flow with an ASCII diagram and logical descriptions of what each level provides, making the nested data structure easier to understand. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> Signed-off-by: Quentin Monnet <qmo@qmon.net>
Member
Author
|
Can be merged immediately (pending review, obviously) - I'll rebase #1264 on top of it. I thought of removing these commits from 1264 but it would mean addressing some conflicts now, then redoing the work in the opposite direction once this PR is merged. So rebasing #1264 on top of this one should be simpler. |
mvachhar
approved these changes
Feb 9, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Some clean-up commits extracted from #1264.
Most of these are by Claude, to whom I asked to clean-up flow-filter/src/tables.rs, because I thought I was about to make the file more complex in coming work (turns out, it's mostly .../setup.rs that I needed to change). I find the gain in clarity is moderate (I hoped I'd get a clearer code organisation) but the clean-ups still simplify some portions of the code, so they're probably worth taking in.