diff options
Diffstat (limited to 'src/buildtool/execution_api')
| -rw-r--r-- | src/buildtool/execution_api/common/tree_reader.hpp | 2 | ||||
| -rw-r--r-- | src/buildtool/execution_api/local/local_api.hpp | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/buildtool/execution_api/common/tree_reader.hpp b/src/buildtool/execution_api/common/tree_reader.hpp index 20e73d7d..9c1b295e 100644 --- a/src/buildtool/execution_api/common/tree_reader.hpp +++ b/src/buildtool/execution_api/common/tree_reader.hpp @@ -111,7 +111,7 @@ class TreeReader final { private: TImpl impl_; - [[nodiscard]] static inline auto IsDirectoryEmpty( + [[nodiscard]] static auto IsDirectoryEmpty( bazel_re::Directory const& dir) noexcept -> bool { return dir.files().empty() and dir.directories().empty() and dir.symlinks().empty(); diff --git a/src/buildtool/execution_api/local/local_api.hpp b/src/buildtool/execution_api/local/local_api.hpp index e564d72f..7ba26b3d 100644 --- a/src/buildtool/execution_api/local/local_api.hpp +++ b/src/buildtool/execution_api/local/local_api.hpp @@ -263,17 +263,17 @@ class LocalApi final : public IExecutionApi { [[nodiscard]] auto Upload(ArtifactBlobContainer&& blobs, bool /*skip_find_missing*/) const noexcept -> bool final { - for (auto const& blob : blobs.Blobs()) { - auto const cas_digest = - blob.digest.IsTree() - ? local_context_.storage->CAS().StoreTree(*blob.data) - : local_context_.storage->CAS().StoreBlob(*blob.data, - blob.is_exec); - if (not cas_digest or *cas_digest != blob.digest) { - return false; - } - } - return true; + auto const range = blobs.Blobs(); + return std::all_of( + range.begin(), + range.end(), + [&cas = local_context_.storage->CAS()](ArtifactBlob const& blob) { + auto const cas_digest = + blob.digest.IsTree() + ? cas.StoreTree(*blob.data) + : cas.StoreBlob(*blob.data, blob.is_exec); + return cas_digest and *cas_digest == blob.digest; + }); } [[nodiscard]] auto UploadTree( |