chore(tvix): Use StatusOr API available in Abseil's version

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
This commit is contained in:
Vincent Ambo 2020-11-21 15:26:02 +01:00
parent cce0ad1bcd
commit cc27324d02
4 changed files with 13 additions and 8 deletions

View file

@ -257,9 +257,10 @@ class EvalStoreSuccessTest
// Test pattern for files that should evaluate successfully but require a real
// store.
TEST_P(EvalStoreSuccessTest, Succeeds) {
std::unique_ptr<nix::LocalStore> store_ =
OpenTemporaryStore().ConsumeValueOrDie();
ref<Store> store = ref<Store>(store_.release());
absl::StatusOr<std::unique_ptr<nix::LocalStore>> store_ =
OpenTemporaryStore();
CHECK(store_.ok()) << "failed to open temporary store";
ref<Store> store = ref<Store>(store_->release());
EvalState state({}, store);
auto path = GetParam();