nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-14 06:22:42 +01:00
Code 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
Download patch file Download diff file Expand all files Collapse all files

8
src/libstore/derivations.cc
View file

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

3
src/libstore/derivations.hh
View file

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