diff options
author | regnat <rg@regnat.ovh> | 2021-05-12 16:19:51 +0200 |
---|---|---|
committer | regnat <rg@regnat.ovh> | 2021-05-12 16:19:51 +0200 |
commit | ec613603ba324bf12f8f554d74fb1a02c6e9b472 (patch) | |
tree | 5fefc7964ba6ebe34ee0b3ad4be053c52434d8b4 /src/libstore/derived-path.hh | |
parent | 7f9759b18d786d26574bfaf3fa00f71402615ff8 (diff) |
DerivedPathWithHints -> BuiltPath
Just a renaming for now
Diffstat (limited to 'src/libstore/derived-path.hh')
-rw-r--r-- | src/libstore/derived-path.hh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/libstore/derived-path.hh b/src/libstore/derived-path.hh index 7a2fe59de..72304f4fa 100644 --- a/src/libstore/derived-path.hh +++ b/src/libstore/derived-path.hh @@ -79,19 +79,19 @@ struct DerivedPath : _DerivedPathRaw { /** * A built derived path with hints in the form of optional concrete output paths. * - * See 'DerivedPathWithHints' for more an explanation. + * See 'BuiltPath' for more an explanation. */ -struct DerivedPathWithHintsBuilt { +struct BuiltPathBuilt { StorePath drvPath; std::map<std::string, std::optional<StorePath>> outputs; nlohmann::json toJSON(ref<Store> store) const; - static DerivedPathWithHintsBuilt parse(const Store & store, std::string_view); + static BuiltPathBuilt parse(const Store & store, std::string_view); }; -using _DerivedPathWithHintsRaw = std::variant< +using _BuiltPathRaw = std::variant< DerivedPath::Opaque, - DerivedPathWithHintsBuilt + BuiltPathBuilt >; /** @@ -109,12 +109,12 @@ using _DerivedPathWithHintsRaw = std::variant< * paths. */ // FIXME Stop using and delete this, or if that is not possible move out of libstore to libcmd. -struct DerivedPathWithHints : _DerivedPathWithHintsRaw { - using Raw = _DerivedPathWithHintsRaw; +struct BuiltPath : _BuiltPathRaw { + using Raw = _BuiltPathRaw; using Raw::Raw; using Opaque = DerivedPathOpaque; - using Built = DerivedPathWithHintsBuilt; + using Built = BuiltPathBuilt; inline const Raw & raw() const { return static_cast<const Raw &>(*this); @@ -122,8 +122,8 @@ struct DerivedPathWithHints : _DerivedPathWithHintsRaw { }; -typedef std::vector<DerivedPathWithHints> DerivedPathsWithHints; +typedef std::vector<BuiltPath> BuiltPaths; -nlohmann::json derivedPathsWithHintsToJSON(const DerivedPathsWithHints & buildables, ref<Store> store); +nlohmann::json derivedPathsWithHintsToJSON(const BuiltPaths & buildables, ref<Store> store); } |