about summary refs log tree commit diff
path: root/third_party/nix/src/nix-daemon
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2020-11-21T14·26+0100
committerVincent Ambo <mail@tazj.in>2020-11-21T14·26+0100
commitcc27324d0226953943f408ce3c69ad7d648e005e (patch)
tree8bb0cc684739a625462dec6ef24008e2d6d20807 /third_party/nix/src/nix-daemon
parentcce0ad1bcd66922790cebf08f173c985fc619225 (diff)
chore(tvix): Use StatusOr API available in Abseil's version r/1888
The Abseil version of `StatusOr` does not come with the status macros
or the `Consume*` family of functions.

This change modifies the existing code to use the common denominator
of the API that is available between Abseil's own implementation of
`StatusOr` and the one from Tensorflow that we are currently using.

Change-Id: I5c37f68636a1fd54d153f95d7303ab8644abb774
Diffstat (limited to 'third_party/nix/src/nix-daemon')
-rw-r--r--third_party/nix/src/nix-daemon/nix-daemon-proto.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/nix/src/nix-daemon/nix-daemon-proto.cc b/third_party/nix/src/nix-daemon/nix-daemon-proto.cc
index 79ff9cadc2d1..b6a5fe358a96 100644
--- a/third_party/nix/src/nix-daemon/nix-daemon-proto.cc
+++ b/third_party/nix/src/nix-daemon/nix-daemon-proto.cc
@@ -245,7 +245,7 @@ class WorkerServiceImpl final : public WorkerService::Service {
                           std::string(nar_hash.status().message()));
           }
 
-          info.narHash = nar_hash.ConsumeValueOrDie();
+          info.narHash = *nar_hash;
           for (const auto& ref : path_info.references()) {
             info.references.insert(ref);
           }