Do big rename to clean up code

- `PathReferences` -> `References`

- `PathReferences<StorePath>` -> `StoreReference`

- `references` -> `others`

- `hasSelfReference` -> `self`

And get rid of silly subclassing

1 files changed, 4 insertions, 3 deletions

diff --git a/src/libstore/path-info.hh b/src/libstore/path-info.hh
index 89886873a..9254835b7 100644
--- a/src/libstore/path-info.hh
+++ b/src/libstore/path-info.hh
@@ -14,20 +14,22 @@ namespace nix {
 class Store;
 
 
-struct SubstitutablePathInfo : PathReferences<StorePath>
+struct SubstitutablePathInfo
 {
     std::optional<StorePath> deriver;
+    StoreReferences references;
     uint64_t downloadSize; /* 0 = unknown or inapplicable */
     uint64_t narSize; /* 0 = unknown */
 };
 
 typedef std::map<StorePath, SubstitutablePathInfo> SubstitutablePathInfos;
 
-struct ValidPathInfo : PathReferences<StorePath>
+struct ValidPathInfo
 {
     StorePath path;
     std::optional<StorePath> deriver;
     Hash narHash;
+    StoreReferences references;
     time_t registrationTime = 0;
     uint64_t narSize = 0; // 0 = unknown
     uint64_t id; // internal use only
@@ -61,7 +63,6 @@ struct ValidPathInfo : PathReferences<StorePath>
         return
             path == i.path
             && narHash == i.narHash
-            && hasSelfReference == i.hasSelfReference
             && references == i.references;
     }