Skip to content

Commit 35fd317

Browse files
committed
toBuildables -> build
1 parent 960e9c5 commit 35fd317

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/nix/build.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ struct CmdBuild : MixDryRun, InstallablesCommand
5050

5151
void run(ref<Store> store) override
5252
{
53-
auto buildables = toBuildables(store, dryRun ? DryRun : Build, installables);
53+
auto buildables = build(store, dryRun ? DryRun : Build, installables);
5454

5555
for (size_t i = 0; i < buildables.size(); ++i) {
5656
auto & b(buildables[i]);

src/nix/command.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ std::shared_ptr<Installable> parseInstallable(
198198
SourceExprCommand & cmd, ref<Store> store, const std::string & installable,
199199
bool useDefaultInstallables);
200200

201-
Buildables toBuildables(ref<Store> store, RealiseMode mode,
201+
Buildables build(ref<Store> store, RealiseMode mode,
202202
std::vector<std::shared_ptr<Installable>> installables);
203203

204204
PathSet toStorePaths(ref<Store> store, RealiseMode mode,

src/nix/installables.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ std::shared_ptr<Installable> parseInstallable(
253253
return installables.front();
254254
}
255255

256-
Buildables toBuildables(ref<Store> store, RealiseMode mode,
256+
Buildables build(ref<Store> store, RealiseMode mode,
257257
std::vector<std::shared_ptr<Installable>> installables)
258258
{
259259
if (mode != Build)
@@ -291,7 +291,7 @@ PathSet toStorePaths(ref<Store> store, RealiseMode mode,
291291
{
292292
PathSet outPaths;
293293

294-
for (auto & b : toBuildables(store, mode, installables))
294+
for (auto & b : build(store, mode, installables))
295295
for (auto & output : b.outputs)
296296
outPaths.insert(output.second);
297297

0 commit comments

Comments
 (0)