From 5ed1884875cc6a6e9330b6c5a2f24c35e685f5a0 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Thu, 21 Dec 2023 10:14:54 -0800
Subject: [PATCH] libcmd: Installable::toStorePaths ->
 Installable::toStorePathSet

---
 src/libcmd/installables.cc | 4 ++--
 src/libcmd/installables.hh | 2 +-
 src/nix/develop.cc         | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/libcmd/installables.cc b/src/libcmd/installables.cc
index 6b3c82374..be9ebe9ca 100644
--- a/src/libcmd/installables.cc
+++ b/src/libcmd/installables.cc
@@ -715,7 +715,7 @@ BuiltPaths Installable::toBuiltPaths(
     }
 }
 
-StorePathSet Installable::toStorePaths(
+StorePathSet Installable::toStorePathSet(
     ref<Store> evalStore,
     ref<Store> store,
     Realise mode, OperateOn operateOn,
@@ -735,7 +735,7 @@ StorePath Installable::toStorePath(
     Realise mode, OperateOn operateOn,
     ref<Installable> installable)
 {
-    auto paths = toStorePaths(evalStore, store, mode, operateOn, {installable});
+    auto paths = toStorePathSet(evalStore, store, mode, operateOn, {installable});
 
     if (paths.size() != 1)
         throw Error("argument '%s' should evaluate to one store path", installable->what());
diff --git a/src/libcmd/installables.hh b/src/libcmd/installables.hh
index e087f935c..c8ad41388 100644
--- a/src/libcmd/installables.hh
+++ b/src/libcmd/installables.hh
@@ -165,7 +165,7 @@ struct Installable
         const Installables & installables,
         BuildMode bMode = bmNormal);
 
-    static std::set<StorePath> toStorePaths(
+    static std::set<StorePath> toStorePathSet(
         ref<Store> evalStore,
         ref<Store> store,
         Realise mode,
diff --git a/src/nix/develop.cc b/src/nix/develop.cc
index 8db2de491..974020951 100644
--- a/src/nix/develop.cc
+++ b/src/nix/develop.cc
@@ -376,7 +376,7 @@ struct Common : InstallableCommand, MixProfile
         for (auto & [installable_, dir_] : redirects) {
             auto dir = absPath(dir_);
             auto installable = parseInstallable(store, installable_);
-            auto builtPaths = Installable::toStorePaths(
+            auto builtPaths = Installable::toStorePathSet(
                 getEvalStore(), store, Realise::Nothing, OperateOn::Output, {installable});
             for (auto & path: builtPaths) {
                 auto from = store->printStorePath(path);
@@ -631,7 +631,7 @@ struct CmdDevelop : Common, MixEnvironment
 
             bool found = false;
 
-            for (auto & path : Installable::toStorePaths(getEvalStore(), store, Realise::Outputs, OperateOn::Output, {bashInstallable})) {
+            for (auto & path : Installable::toStorePathSet(getEvalStore(), store, Realise::Outputs, OperateOn::Output, {bashInstallable})) {
                 auto s = store->printStorePath(path) + "/bin/bash";
                 if (pathExists(s)) {
                     shell = s;