Inline the usage of nix::readDirectory and remove it
#10684
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
`nix::readDirectory` is removed. `std::filesystem::directory_iterator` is used directly in places that used this util.
siddhantk232
requested review from
thufschmitt,
Ericson2314 and
edolstra
as code owners
github-actions
bot
added
new-cli
edolstra
approved these changes
May 13, 2024
|
Can you resolve the conflicts? Then we can merge this. |
edolstra
changed the title
nix::readDirectory and remove it. nix::readDirectory and remove it
|
@siddhantk232 can you make sure ever for loop callsite has a "check interrupt" like before? This will make sure we don't regress with control-C support and very wide directories. |
Thanks for pointing this out! I'll open another PR that does this. |
Mic92
reviewed
Jul 5, 2024
| if (entries.size() == 1) | ||
| tmpFile = entries[0].path(); | ||
| auto entries = std::filesystem::directory_iterator{unpacked}; | ||
| auto file_count = std::distance(entries, std::filesystem::directory_iterator{}); |
There was a problem hiding this comment.
This broke the prefetch command if unpack is used. Fixed in #11051
Mic92
reviewed
Jul 5, 2024
| auto entries = readDirectory(out); | ||
| if (entries.size() != 1) | ||
| auto entries = std::filesystem::directory_iterator{out}; | ||
| auto fileName = entries->path().string(); |
There was a problem hiding this comment.
Maybe this way around it actually works.
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.
nix::readDirectoryis removed.std::filesystem::directory_iteratoris used directly in places that used this util.Motivation
The
nix::readDirectoryusesstd::filesystem::directory_iteratorand pushes all the entries in astd::vectorbefore returning it. This is redundant as we can directly usestd::filesystem::directory_iteratorto iterate through entries and count files (and dirs) in path.Context
#9205
Priorities and Process
Add 👍 to pull requests you find important.
The Nix maintainer team uses a GitHub project board to schedule and track reviews.