inline the usage of nix::renameFile, nix::getFileType and nix::copyFile
#10685
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
use `std::filesystem::rename` everywhere and remove `nix::renameFile`
the old `copyFile` was just a wrapper that was calling the `copy` function. This wrapper function is removed and the `copy` function is renamed to `copyFile`.
siddhantk232
requested review from
thufschmitt,
Ericson2314 and
edolstra
as code owners
github-actions
bot
added
the
store
This comment was marked as off-topic.
This comment was marked as off-topic.
edolstra
approved these changes
May 13, 2024
src/libutil/file-system.hh
Outdated
| @@ -194,7 +190,7 @@ void moveFile(const Path & src, const Path & dst); | |||
| * with the guaranty that the destination will be “fresh”, with no stale inode | |||
| * or file descriptor pointing to it). | |||
| */ | |||
| void copyFile(const Path & oldPath, const Path & newPath, bool andDelete); | |||
| void copyFile(const std::filesystem::directory_entry & from, const std::filesystem::path & to, bool andDelete); | |||
There was a problem hiding this comment.
Why is from a directory_entry rather than a path?
There was a problem hiding this comment.
I have changed it to use path instead in 62e1ea2. Not sure why it was directory_entry before.
Ericson2314
reviewed
May 13, 2024
| @@ -611,55 +605,45 @@ static void setWriteTime(const fs::path & p, const struct stat & st) | |||
| } | |||
| #endif | |||
|
|
|||
| void copy(const fs::directory_entry & from, const fs::path & to, bool andDelete) | |||
There was a problem hiding this comment.
I think we might still want a copyEntry function as an implementation detail because it can avoid another stat in many cases (because the directory listing already has the info).
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.
Motivation
In order to reduce the footprint of our filesystem API, we're trying to remove existing functions with direct calls to
std::filesystemfunctions.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.