From 35fd31770c589f28c569e7868f868a5b558cf83d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 9 Feb 2018 16:42:32 +0100 Subject: [PATCH] toBuildables -> build --- src/nix/build.cc | 2 +- src/nix/command.hh | 2 +- src/nix/installables.cc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/nix/build.cc b/src/nix/build.cc index f7c99f12d..b4f21b32d 100644 --- a/src/nix/build.cc +++ b/src/nix/build.cc @@ -50,7 +50,7 @@ struct CmdBuild : MixDryRun, InstallablesCommand void run(ref store) override { - auto buildables = toBuildables(store, dryRun ? DryRun : Build, installables); + auto buildables = build(store, dryRun ? DryRun : Build, installables); for (size_t i = 0; i < buildables.size(); ++i) { auto & b(buildables[i]); diff --git a/src/nix/command.hh b/src/nix/command.hh index a7863c49f..97a6fee7f 100644 --- a/src/nix/command.hh +++ b/src/nix/command.hh @@ -198,7 +198,7 @@ std::shared_ptr parseInstallable( SourceExprCommand & cmd, ref store, const std::string & installable, bool useDefaultInstallables); -Buildables toBuildables(ref store, RealiseMode mode, +Buildables build(ref store, RealiseMode mode, std::vector> installables); PathSet toStorePaths(ref store, RealiseMode mode, diff --git a/src/nix/installables.cc b/src/nix/installables.cc index c3b06c22e..a3fdd8a28 100644 --- a/src/nix/installables.cc +++ b/src/nix/installables.cc @@ -253,7 +253,7 @@ std::shared_ptr parseInstallable( return installables.front(); } -Buildables toBuildables(ref store, RealiseMode mode, +Buildables build(ref store, RealiseMode mode, std::vector> installables) { if (mode != Build) @@ -291,7 +291,7 @@ PathSet toStorePaths(ref store, RealiseMode mode, { PathSet outPaths; - for (auto & b : toBuildables(store, mode, installables)) + for (auto & b : build(store, mode, installables)) for (auto & output : b.outputs) outPaths.insert(output.second);