1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-21 01:39:36 +01:00

Apply clang-format universally.

* It is tough to contribute to a project that doesn't use a formatter,
* It is extra hard to contribute to a project which has configured the formatter, but ignores it for some files
* Code formatting makes it harder to hide obscure / weird bugs by accident or on purpose,

Let's rip the bandaid off?

Note that PRs currently in flight should be able to be merged relatively easily by applying `clang-format` to their tip prior to merge.
This commit is contained in:
Graham Christensen 2025-07-18 12:47:27 -04:00
parent 41bf87ec70
commit e4f62e4608
587 changed files with 23258 additions and 23135 deletions

View file

@ -7,14 +7,13 @@
#include <mutex>
#include <algorithm>
namespace nix {
PathRefScanSink::PathRefScanSink(StringSet && hashes, std::map<std::string, StorePath> && backMap)
: RefScanSink(std::move(hashes))
, backMap(std::move(backMap))
{ }
{
}
PathRefScanSink PathRefScanSink::fromPaths(const StorePathSet & refs)
{
@ -44,24 +43,18 @@ StorePathSet PathRefScanSink::getResultPaths()
return found;
}
std::pair<StorePathSet, HashResult> scanForReferences(
const std::string & path,
const StorePathSet & refs)
std::pair<StorePathSet, HashResult> scanForReferences(const std::string & path, const StorePathSet & refs)
{
HashSink hashSink { HashAlgorithm::SHA256 };
HashSink hashSink{HashAlgorithm::SHA256};
auto found = scanForReferences(hashSink, path, refs);
auto hash = hashSink.finish();
return std::pair<StorePathSet, HashResult>(found, hash);
}
StorePathSet scanForReferences(
Sink & toTee,
const Path & path,
const StorePathSet & refs)
StorePathSet scanForReferences(Sink & toTee, const Path & path, const StorePathSet & refs)
{
PathRefScanSink refsSink = PathRefScanSink::fromPaths(refs);
TeeSink sink { refsSink, toTee };
TeeSink sink{refsSink, toTee};
/* Look for the hashes in the NAR dump of the path. */
dumpPath(path, sink);
@ -69,4 +62,4 @@ StorePathSet scanForReferences(
return refsSink.getResultPaths();
}
}
} // namespace nix