Merge pull request #9197 from obsidiansystems/delete-dead-code

Delete dead code
NixOS · Oct 20, 2023 · 81ed1d5 · 81ed1d5
2 parents 85e5ac4 + 862d164
commit 81ed1d5
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 16 deletions.
diff --git a/src/libstore/build/local-derivation-goal.hh b/src/libstore/build/local-derivation-goal.hh
@@ -120,14 +120,6 @@ struct LocalDerivationGoal : public DerivationGoal
      */
     OutputPathMap scratchOutputs;
 
-    /**
-     * Path registration info from the previous round, if we're
-     * building multiple times. Since this contains the hash, it
-     * allows us to compare whether two rounds produced the same
-     * result.
-     */
-    std::map<Path, ValidPathInfo> prevInfos;
-
     uid_t sandboxUid() { return usingUserNamespace ? (!buildUser || buildUser->getUIDCount() == 1 ? 1000 : 0) : buildUser->getUID(); }
     gid_t sandboxGid() { return usingUserNamespace ? (!buildUser || buildUser->getUIDCount() == 1 ? 100  : 0) : buildUser->getGID(); }
 

diff --git a/src/libstore/path-info.hh b/src/libstore/path-info.hh
@@ -72,14 +72,6 @@ struct ValidPathInfo
      */
     std::optional<ContentAddress> ca;
 
-    bool operator == (const ValidPathInfo & i) const
-    {
-        return
-            path == i.path
-            && narHash == i.narHash
-            && references == i.references;
-    }
-
     /**
      * Return a fingerprint of the store path to be used in binary
      * cache signatures. It contains the store path, the base-32