A few minor updates for tmpfiles code #4725
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
While returning an iterator was more elegant, it makes error handling much more difficult *and* we had intermediate `collects()` that meant it wasn't really lazy. Trying to remove the intermediate `collect` runs into borrowing issues (on the input `&Dir`) and this isn't a high performance path so doing the more obvious simpler thing is better.
I hit a test failure in one run because HashMap is not ordered predictably.
Since we're now returning a direct map we don't need to convert to a set, we can just ignore the values when iterating.
|
Looks sane and more neat, thanks for the updates! |
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.
tmpfiles: Rename reader function
tmpfiles: Change
read_tmpfilesto return a direct hashmapWhile returning an iterator was more elegant, it makes
error handling much more difficult and we had intermediate
collects()that meant it wasn't really lazy.Trying to remove the intermediate
collectruns into borrowingissues (on the input
&Dir) and this isn't a high performancepath so doing the more obvious simpler thing is better.
tmpfiles: Collect into a BTreeMap for reproducibility
I hit a test failure in one run because HashMap is not ordered
predictably.
tmpfiles: Drop intermediate re-allocation
Since we're now returning a direct map we don't need
to convert to a set, we can just ignore the values when iterating.