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

experimental/optional -> optional

Browse source
This commit is contained in:
Eelco Dolstra 2019-02-12 13:43:32 +01:00
parent 86f3b94c8c
commit ef52ccf035
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
14 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libexpr/eval.hh
View file

@ -81,7 +81,7 @@ public:
/* The allowed filesystem paths in restricted or pure evaluation
mode. */
std::experimental::optional<PathSet> allowedPaths;
std::optional<PathSet> allowedPaths;
Value vEmptySet;

2
src/libexpr/get-drvs.cc
View file

@ -295,7 +295,7 @@ static bool getDerivation(EvalState & state, Value & v,
}
std::experimental::optional<DrvInfo> getDerivation(EvalState & state, Value & v,
std::optional<DrvInfo> getDerivation(EvalState & state, Value & v,
bool ignoreAssertionFailures)
{
Done done;

2
src/libexpr/get-drvs.hh
View file

@ -78,7 +78,7 @@ typedef list<DrvInfo> DrvInfos;
/* If value `v' denotes a derivation, return a DrvInfo object
describing it. Otherwise return nothing. */
std::experimental::optional<DrvInfo> getDerivation(EvalState & state,
std::optional<DrvInfo> getDerivation(EvalState & state,
Value & v, bool ignoreAssertionFailures);
void getDerivations(EvalState & state, Value & v, const string & pathPrefix,

2
src/libexpr/primops.cc
View file

@ -555,7 +555,7 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
PathSet context;
std::experimental::optional<std::string> outputHash;
std::optional<std::string> outputHash;
std::string outputHashAlgo;
bool outputHashRecursive = false;

4
src/libexpr/primops/fetchGit.cc
View file

@ -26,7 +26,7 @@ struct GitInfo
std::regex revRegex("^[0-9a-fA-F]{40}$");
GitInfo exportGit(ref<Store> store, const std::string & uri,
std::experimental::optional<std::string> ref, std::string rev,
std::optional<std::string> ref, std::string rev,
const std::string & name)
{
if (evalSettings.pureEval && rev == "")
@ -190,7 +190,7 @@ GitInfo exportGit(ref<Store> store, const std::string & uri,
static void prim_fetchGit(EvalState & state, const Pos & pos, Value * * args, Value & v)
{
std::string url;
std::experimental::optional<std::string> ref;
std::optional<std::string> ref;
std::string rev;
std::string name = "source";
PathSet context;