diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/buildtool/execution_api/common/TARGETS | 5 | ||||
-rw-r--r-- | src/buildtool/execution_api/common/artifact_blob.hpp | 6 | ||||
-rw-r--r-- | src/buildtool/execution_api/remote/bazel/bazel_network_reader.cpp | 7 |
3 files changed, 3 insertions, 15 deletions
diff --git a/src/buildtool/execution_api/common/TARGETS b/src/buildtool/execution_api/common/TARGETS index 8cdbda6d..35d85b00 100644 --- a/src/buildtool/execution_api/common/TARGETS +++ b/src/buildtool/execution_api/common/TARGETS @@ -134,10 +134,7 @@ , "name": ["artifact_blob"] , "hdrs": ["artifact_blob.hpp"] , "deps": - [ ["@", "gsl", "", "gsl"] - , ["src/buildtool/common", "common"] - , ["src/utils/cpp", "hash_combine"] - ] + [["src/buildtool/common", "common"], ["src/utils/cpp", "hash_combine"]] , "stage": ["src", "buildtool", "execution_api", "common"] } } diff --git a/src/buildtool/execution_api/common/artifact_blob.hpp b/src/buildtool/execution_api/common/artifact_blob.hpp index b1e8980a..c54ac2fe 100644 --- a/src/buildtool/execution_api/common/artifact_blob.hpp +++ b/src/buildtool/execution_api/common/artifact_blob.hpp @@ -21,7 +21,6 @@ #include <string> #include <utility> //std::move -#include "gsl/gsl" #include "src/buildtool/common/artifact_digest.hpp" #include "src/utils/cpp/hash_combine.hpp" @@ -33,11 +32,6 @@ struct ArtifactBlob final { data{std::make_shared<std::string>(std::move(mydata))}, is_exec{is_exec} {} - ArtifactBlob(ArtifactDigest digest, - gsl::not_null<std::shared_ptr<std::string>> const& mydata, - bool is_exec) noexcept - : digest{std::move(digest)}, data(mydata), is_exec{is_exec} {} - [[nodiscard]] auto operator==(ArtifactBlob const& other) const noexcept -> bool { return digest == other.digest and is_exec == other.is_exec; diff --git a/src/buildtool/execution_api/remote/bazel/bazel_network_reader.cpp b/src/buildtool/execution_api/remote/bazel/bazel_network_reader.cpp index 46bb151b..48cdd414 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_network_reader.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_network_reader.cpp @@ -223,11 +223,8 @@ auto BazelNetworkReader::BatchReadBlobs( continue; } - ArtifactBlob artifact_blob{ - digest, value.value()->data, value.value()->is_exec}; - - if (Validate(artifact_blob)) { - validated[hash] = &artifacts.emplace_back(std::move(artifact_blob)); + if (Validate(*value.value())) { + validated[hash] = &artifacts.emplace_back(*value.value()); } else { validated[hash] = nullptr; |