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.
The original code was not building for me locally, with the following compiler errors:
drain_filter
has been renamed toextract_if
andhash_drain_filter
tohash_extract_if
. Therefore I've substituted thedrain_filter
calls with equivalentextract_if
calls.option_result_contains
has been removed, as far as I can see there are no substitues. The code builds without this gate so I've removed it, but I'm not completely sure if that's the correct thing to do.