wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-26 15:51:15 +02:00
Code Activity

inline the usage of nix::renameFile

Browse source 
use `std::filesystem::rename` everywhere and remove `nix::renameFile`
This commit is contained in:
siddhantCodes 2024-05-12 18:40:16 +05:30
parent 87ab3c0ea4
commit 4537663740
8 changed files with 11 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/libutil/file-system.cc
View file

@ -588,7 +588,7 @@ void replaceSymlink(const Path & target, const Path & link)
throw;
}
renameFile(tmp, link);
std::filesystem::rename(tmp, link);
break;
}
@ -651,15 +651,10 @@ void copyFile(const Path & oldPath, const Path & newPath, bool andDelete)
return copy(fs::directory_entry(fs::path(oldPath)), fs::path(newPath), andDelete);
}
void renameFile(const Path & oldName, const Path & newName)
{
fs::rename(oldName, newName);
}
void moveFile(const Path & oldName, const Path & newName)
{
try {
renameFile(oldName, newName);
std::filesystem::rename(oldName, newName);
} catch (fs::filesystem_error & e) {
auto oldPath = fs::path(oldName);
auto newPath = fs::path(newName);
@ -674,7 +669,7 @@ void moveFile(const Path & oldName, const Path & newName)
fs::remove(newPath);
warn("Can’t rename %s as %s, copying instead", oldName, newName);
copy(fs::directory_entry(oldPath), tempCopyTarget, true);
renameFile(
std::filesystem::rename(
os_string_to_string(PathViewNG { tempCopyTarget }),
os_string_to_string(PathViewNG { newPath }));
}