maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

7
third_party/nix/src/tests/store-util.hh vendored
View file

@ -58,10 +58,13 @@ class StoreTest : public ::testing::Test {
}
absl::StatusOr<std::unique_ptr<nix::LocalStore>> OpenTemporaryStore() {
ASSIGN_OR_RETURN(std::filesystem::path storePath, OpenTempDir());
absl::StatusOr<std::filesystem::path> storePath = OpenTempDir();
if (!storePath.ok()) {
return storePath.status();
}
nix::Store::Params params;
params["root"] = storePath;
params["root"] = *storePath;
return std::make_unique<nix::LocalStore>(params);
}