From ee6f54124360d8a72b9b545dcc581f3c80d3c8a9 Mon Sep 17 00:00:00 2001 From: Sascha Roloff Date: Mon, 11 Jul 2022 19:55:10 +0200 Subject: Modified artifact digest to provide wire digest on demand --- src/buildtool/build_engine/target_map/target_cache.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/buildtool/build_engine/target_map/target_cache.cpp') diff --git a/src/buildtool/build_engine/target_map/target_cache.cpp b/src/buildtool/build_engine/target_map/target_cache.cpp index d9fea021..8ba54557 100644 --- a/src/buildtool/build_engine/target_map/target_cache.cpp +++ b/src/buildtool/build_engine/target_map/target_cache.cpp @@ -23,8 +23,7 @@ auto TargetCache::Key::Create(BuildMaps::Base::EntityName const& target, {"effective_config", effective_config.ToString()}}}; static auto const& cas = LocalCAS::Instance(); if (auto target_key = cas.StoreBlobFromBytes(target_desc.dump(2))) { - return Key{ - {ArtifactDigest{std::move(*target_key)}, ObjectType::File}}; + return Key{{ArtifactDigest{*target_key}, ObjectType::File}}; } } } catch (std::exception const& ex) { @@ -54,9 +53,9 @@ auto TargetCache::Entry::ToResult() const -> std::optional { auto TargetCache::Store(Key const& key, Entry const& value) const noexcept -> bool { if (auto digest = CAS().StoreBlobFromBytes(value.ToJson().dump(2))) { - auto data = Artifact::ObjectInfo{ArtifactDigest{std::move(*digest)}, - ObjectType::File} - .ToString(); + auto data = + Artifact::ObjectInfo{ArtifactDigest{*digest}, ObjectType::File} + .ToString(); logger_.Emit(LogLevel::Debug, "Adding entry for key {} as {}", key.Id().ToString(), -- cgit v1.2.3