nrabulinski/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Use designated initializers for DerivationOutputHash

Browse source
This commit is contained in:
John Ericson 2020-06-19 14:58:30 +00:00
parent 237d88c97e
commit 145d88cb2a
4 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libexpr/primops.cc
View file

@ -776,7 +776,10 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
if (!jsonObject) drv.env["out"] = state.store->printStorePath(outPath); if (!jsonObject) drv.env["out"] = state.store->printStorePath(outPath);
drv.outputs.insert_or_assign("out", DerivationOutput { drv.outputs.insert_or_assign("out", DerivationOutput {
.path = std::move(outPath), .path = std::move(outPath),
.hash = DerivationOutputHash { ingestionMethod, std::move(h) }, .hash = DerivationOutputHash {
.method = ingestionMethod,
.hash = std::move(h),
},
}); });
} }

8
src/libstore/derivations.cc
View file

@ -124,8 +124,8 @@ static DerivationOutput parseDerivationOutput(const Store & store, istringstream
if (hashType == htUnknown) if (hashType == htUnknown)
throw Error("unknown hash hashAlgorithm '%s'", hashAlgo); throw Error("unknown hash hashAlgorithm '%s'", hashAlgo);
fsh = DerivationOutputHash { fsh = DerivationOutputHash {
std::move(method), .method = std::move(method),
Hash(hash, hashType), .hash = Hash(hash, hashType),
}; };
} }
@ -424,8 +424,8 @@ static DerivationOutput readDerivationOutput(Source & in, const Store & store)
if (hashType == htUnknown) if (hashType == htUnknown)
throw Error("unknown hash hashAlgorithm '%s'", hashAlgo); throw Error("unknown hash hashAlgorithm '%s'", hashAlgo);
fsh = DerivationOutputHash { fsh = DerivationOutputHash {
std::move(method), .method = std::move(method),
Hash(hash, hashType), .hash = Hash(hash, hashType),
}; };
} }

3
src/libstore/derivations.hh
View file

@ -20,9 +20,6 @@ struct DerivationOutputHash {
: method(std::move(method)) : method(std::move(method))
, hash(std::move(hash)) , hash(std::move(hash))
{ } { }
DerivationOutputHash(const DerivationOutputHash &) = default;
DerivationOutputHash(DerivationOutputHash &&) = default;
DerivationOutputHash & operator = (const DerivationOutputHash &) = default;
std::string printMethodAlgo() const; std::string printMethodAlgo() const;
}; };

3
src/nix/develop.cc
View file

@ -138,7 +138,8 @@ StorePath getDerivationEnvironment(ref<Store> store, const StorePath & drvPath)
drv.outputs.insert_or_assign("out", DerivationOutput { drv.outputs.insert_or_assign("out", DerivationOutput {
.path = shellOutPath, .path = shellOutPath,
.hash = DerivationOutputHash { .hash = DerivationOutputHash {
FileIngestionMethod::Flat, Hash { } .method = FileIngestionMethod::Flat,
.hash = Hash { },
}, },
}); });
drv.env["out"] = store->printStorePath(shellOutPath); drv.env["out"] = store->printStorePath(shellOutPath);