treewide: print* -> format* for functions not printing
Those functions have been recently refactored to return a formatted `string` or take an `std::ostream` and only do the formatting have been renamed to match what they're actually doing. Change-Id: I3fe32fbe8723c2d93226370b8dd297f16a6a6964
This commit is contained in:
@@ -40,7 +40,7 @@ static std::string makeNode(std::string_view id, std::string_view label,
|
||||
dotQuote(id), dotQuote(label), dotQuote(colour));
|
||||
}
|
||||
|
||||
kj::Promise<Result<std::string>> printDotGraph(ref<Store> store, StorePathSet && roots)
|
||||
kj::Promise<Result<std::string>> formatDotGraph(ref<Store> store, StorePathSet && roots)
|
||||
try {
|
||||
StorePathSet workList(std::move(roots));
|
||||
StorePathSet doneSet;
|
||||
|
||||
@@ -5,5 +5,5 @@
|
||||
|
||||
namespace nix {
|
||||
|
||||
kj::Promise<Result<std::string>> printDotGraph(ref<Store> store, StorePathSet && roots);
|
||||
kj::Promise<Result<std::string>> formatDotGraph(ref<Store> store, StorePathSet && roots);
|
||||
}
|
||||
|
||||
@@ -45,7 +45,7 @@ static std::string makeNode(const ValidPathInfo & info)
|
||||
(info.path.isDerivation() ? "derivation" : "output-path"));
|
||||
}
|
||||
|
||||
kj::Promise<Result<std::string>> printGraphML(ref<Store> store, StorePathSet && roots)
|
||||
kj::Promise<Result<std::string>> formatGraphML(ref<Store> store, StorePathSet && roots)
|
||||
try {
|
||||
StorePathSet workList(std::move(roots));
|
||||
StorePathSet doneSet;
|
||||
|
||||
@@ -5,5 +5,5 @@
|
||||
|
||||
namespace nix {
|
||||
|
||||
kj::Promise<Result<std::string>> printGraphML(ref<Store> store, StorePathSet && roots);
|
||||
kj::Promise<Result<std::string>> formatGraphML(ref<Store> store, StorePathSet && roots);
|
||||
}
|
||||
|
||||
@@ -892,7 +892,7 @@ static bool cmpElemByName(EvalState & state, DrvInfo & a, DrvInfo & b)
|
||||
|
||||
typedef std::list<Strings> Table;
|
||||
|
||||
std::string printTable(Table & table)
|
||||
std::string formatTable(Table & table)
|
||||
{
|
||||
auto nrColumns = table.size() > 0 ? table.front().size() : 0;
|
||||
|
||||
@@ -1367,7 +1367,7 @@ static void opQuery(Globals & globals, Strings opFlags, Strings opArgs)
|
||||
}
|
||||
|
||||
if (!xmlOutput) {
|
||||
pager << printTable(table);
|
||||
pager << formatTable(table);
|
||||
} else {
|
||||
pager << xmlStream.str();
|
||||
}
|
||||
|
||||
@@ -502,7 +502,7 @@ opQuery(std::shared_ptr<Store> store, AsyncIoRoot & aio, Strings opFlags, String
|
||||
roots.insert(j);
|
||||
}
|
||||
}
|
||||
pager << aio.blockOn(printDotGraph(ref<Store>::unsafeFromPtr(store), std::move(roots)));
|
||||
pager << aio.blockOn(formatDotGraph(ref<Store>::unsafeFromPtr(store), std::move(roots)));
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -516,7 +516,7 @@ opQuery(std::shared_ptr<Store> store, AsyncIoRoot & aio, Strings opFlags, String
|
||||
roots.insert(j);
|
||||
}
|
||||
}
|
||||
pager << aio.blockOn(printGraphML(ref<Store>::unsafeFromPtr(store), std::move(roots)));
|
||||
pager << aio.blockOn(formatGraphML(ref<Store>::unsafeFromPtr(store), std::move(roots)));
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user