moveFile -> renameFile

`move` tends to have this `mv` connotation of “I will copy it for you if
needs be”

src/libstore/build/derivation-goal.cc

@@ -705,7 +705,7 @@ static void movePath(const Path & src, const Path & dst)
     if (changePerm)
         chmod_(src, st.st_mode | S_IWUSR);
 
-    moveFile(src, dst);
+    renameFile(src, dst);
 
     if (changePerm)
         chmod_(dst, st.st_mode);

src/libstore/build/local-derivation-goal.cc

@@ -223,7 +223,7 @@ static void movePath(const Path & src, const Path & dst)
     if (changePerm)
         chmod_(src, st.st_mode | S_IWUSR);
 
-    moveFile(src, dst);
+    renameFile(src, dst);
 
     if (changePerm)
         chmod_(dst, st.st_mode);
@@ -310,7 +310,7 @@ bool LocalDerivationGoal::cleanupDecideWhetherDiskFull()
             if (buildMode != bmCheck && status.known->isValid()) continue;
             auto p = worker.store.printStorePath(status.known->path);
             if (pathExists(chrootRootDir + p))
-                moveFile((chrootRootDir + p), p);
+                renameFile((chrootRootDir + p), p);
         }
 
     return diskFull;
@@ -2624,7 +2624,7 @@ DrvOutputs LocalDerivationGoal::registerOutputs()
             Path prev = path + checkSuffix;
             deletePath(prev);
             Path dst = path + checkSuffix;
-            moveFile(path, dst);
+            renameFile(path, dst);
         }
     }
 

src/libstore/builtins/unpack-channel.cc

@@ -22,7 +22,7 @@ void builtinUnpackChannel(const BasicDerivation & drv)
     auto entries = readDirectory(out);
     if (entries.size() != 1)
         throw Error("channel tarball '%s' contains more than one file", src);
-    moveFile((out + "/" + entries[0].name), (out + "/" + channelName));
+    renameFile((out + "/" + entries[0].name), (out + "/" + channelName));
 }
 
 }

src/libstore/gc.cc

@@ -39,7 +39,7 @@ static void makeSymlink(const Path & link, const Path & target)
     createSymlink(target, tempLink);
 
     /* Atomically replace the old one. */
-    moveFile(tempLink, link);
+    renameFile(tempLink, link);
 }
 
 

src/libstore/local-binary-cache-store.cc

@@ -57,7 +57,7 @@ protected:
         AutoDelete del(tmp, false);
         StreamToSourceAdapter source(istream);
         writeFile(tmp, source);
-        moveFile(tmp, path2);
+        renameFile(tmp, path2);
         del.cancel();
     }
 

src/libstore/local-store.cc

@@ -1430,7 +1430,7 @@ StorePath LocalStore::addToStoreFromDump(Source & source0, std::string_view name
                     writeFile(realPath, dumpSource);
             } else {
                 /* Move the temporary path we restored above. */
-                moveFile(tempPath, realPath);
+                renameFile(tempPath, realPath);
             }
 
             /* For computing the nar hash. In recursive SHA-256 mode, this
@@ -1941,7 +1941,7 @@ void LocalStore::addBuildLog(const StorePath & drvPath, std::string_view log)
 
     writeFile(tmpFile, compress("bzip2", log));
 
-    moveFile(tmpFile, logPath);
+    renameFile(tmpFile, logPath);
 }
 
 std::optional<std::string> LocalStore::getVersion()

src/libstore/optimise-store.cc

@@ -230,7 +230,7 @@ void LocalStore::optimisePath_(Activity * act, OptimiseStats & stats,
 
     /* Atomically replace the old file with the new hard link. */
     try {
-        moveFile(tempLink, path);
+        renameFile(tempLink, path);
     } catch (SysError & e) {
         if (unlink(tempLink.c_str()) == -1)
             printError("unable to unlink '%1%'", tempLink);

src/libutil/filesystem.cc

@@ -37,7 +37,7 @@ void replaceSymlink(const Path & target, const Path & link,
             throw;
         }
 
-        moveFile(tmp, link);
+        renameFile(tmp, link);
 
         break;
     }
@@ -90,7 +90,7 @@ void copy(const fs::directory_entry & from, const fs::path & to, bool andDelete)
     }
 }
 
-void moveFile(const Path & oldName, const Path & newName)
+void renameFile(const Path & oldName, const Path & newName)
 {
     auto oldPath = fs::path(oldName);
     auto newPath = fs::path(newName);

src/libutil/util.hh

@@ -168,7 +168,7 @@ void createSymlink(const Path & target, const Path & link,
 void replaceSymlink(const Path & target, const Path & link,
     std::optional<time_t> mtime = {});
 
-void moveFile(const Path & src, const Path & dst);
+void renameFile(const Path & src, const Path & dst);
 
 
 /* Wrappers arount read()/write() that read/write exactly the