mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

style(3p/nix): Final act in the brace-wrapping saga

Browse source 
This last change set was generated by a full clang-tidy run (including
compilation):

    clang-tidy -p ~/projects/nix-build/ \
      -checks=-*,readability-braces-around-statements -fix src/*/*.cc

Actually running clang-tidy requires some massaging to make it play
nice with Nix + meson, I'll be adding a wrapper or something for that soon.
This commit is contained in:
Vincent Ambo 2020-05-19 20:47:23 +01:00
parent cf40d08908
commit 3908732181
84 changed files with 2601 additions and 1554 deletions
Download patch file Download diff file Expand all files Collapse all files

26
third_party/nix/src/nix-copy-closure/nix-copy-closure.cc vendored
View file

@ -18,32 +18,33 @@ static int _main(int argc, char** argv) {
parseCmdLine(
argc, argv, [&](Strings::iterator& arg, const Strings::iterator& end) {
if (*arg == "--help")
if (*arg == "--help") {
showManPage("nix-copy-closure");
else if (*arg == "--version")
} else if (*arg == "--version") {
printVersion("nix-copy-closure");
else if (*arg == "--gzip" || *arg == "--bzip2" || *arg == "--xz") {
} else if (*arg == "--gzip" || *arg == "--bzip2" || *arg == "--xz") {
if (*arg != "--gzip") {
LOG(WARNING) << "'" << *arg
<< "' is not implemented, falling back to gzip";
}
gzip = true;
} else if (*arg == "--from")
} else if (*arg == "--from") {
toMode = false;
else if (*arg == "--to")
} else if (*arg == "--to") {
toMode = true;
else if (*arg == "--include-outputs")
} else if (*arg == "--include-outputs") {
includeOutputs = true;
else if (*arg == "--show-progress")
} else if (*arg == "--show-progress") {
LOG(WARNING) << "'--show-progress' is not implemented";
else if (*arg == "--dry-run")
} else if (*arg == "--dry-run") {
dryRun = true;
else if (*arg == "--use-substitutes" || *arg == "-s")
} else if (*arg == "--use-substitutes" || *arg == "-s") {
useSubstitutes = Substitute;
else if (sshHost.empty())
} else if (sshHost.empty()) {
sshHost = *arg;
else
} else {
storePaths.insert(*arg);
}
return true;
});
@ -58,8 +59,9 @@ static int _main(int argc, char** argv) {
auto from = toMode ? openStore() : openStore(remoteUri);
PathSet storePaths2;
for (auto& path : storePaths)
for (auto& path : storePaths) {
storePaths2.insert(from->followLinksToStorePath(path));
}
PathSet closure;
from->computeFSClosure(storePaths2, closure, false, includeOutputs);