From 41a68f206fa23fed28d1805e16bac89a933162a8 Mon Sep 17 00:00:00 2001 From: Justin ! Date: Mon, 19 Jan 2026 18:44:40 -0500 Subject: [PATCH] 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 --- lix/legacy/dotgraph.cc | 2 +- lix/legacy/dotgraph.hh | 2 +- lix/legacy/graphml.cc | 2 +- lix/legacy/graphml.hh | 2 +- lix/legacy/nix-env.cc | 4 ++-- lix/legacy/nix-store.cc | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lix/legacy/dotgraph.cc b/lix/legacy/dotgraph.cc index b60bb1cd0..7d3f824ec 100644 --- a/lix/legacy/dotgraph.cc +++ b/lix/legacy/dotgraph.cc @@ -40,7 +40,7 @@ static std::string makeNode(std::string_view id, std::string_view label, dotQuote(id), dotQuote(label), dotQuote(colour)); } -kj::Promise> printDotGraph(ref store, StorePathSet && roots) +kj::Promise> formatDotGraph(ref store, StorePathSet && roots) try { StorePathSet workList(std::move(roots)); StorePathSet doneSet; diff --git a/lix/legacy/dotgraph.hh b/lix/legacy/dotgraph.hh index 49c801b6a..aa9c9bd60 100644 --- a/lix/legacy/dotgraph.hh +++ b/lix/legacy/dotgraph.hh @@ -5,5 +5,5 @@ namespace nix { -kj::Promise> printDotGraph(ref store, StorePathSet && roots); +kj::Promise> formatDotGraph(ref store, StorePathSet && roots); } diff --git a/lix/legacy/graphml.cc b/lix/legacy/graphml.cc index 9b9df08eb..31fd76f97 100644 --- a/lix/legacy/graphml.cc +++ b/lix/legacy/graphml.cc @@ -45,7 +45,7 @@ static std::string makeNode(const ValidPathInfo & info) (info.path.isDerivation() ? "derivation" : "output-path")); } -kj::Promise> printGraphML(ref store, StorePathSet && roots) +kj::Promise> formatGraphML(ref store, StorePathSet && roots) try { StorePathSet workList(std::move(roots)); StorePathSet doneSet; diff --git a/lix/legacy/graphml.hh b/lix/legacy/graphml.hh index 5de83e32a..31877b36f 100644 --- a/lix/legacy/graphml.hh +++ b/lix/legacy/graphml.hh @@ -5,5 +5,5 @@ namespace nix { -kj::Promise> printGraphML(ref store, StorePathSet && roots); +kj::Promise> formatGraphML(ref store, StorePathSet && roots); } diff --git a/lix/legacy/nix-env.cc b/lix/legacy/nix-env.cc index babcc8c62..50e839cd7 100644 --- a/lix/legacy/nix-env.cc +++ b/lix/legacy/nix-env.cc @@ -892,7 +892,7 @@ static bool cmpElemByName(EvalState & state, DrvInfo & a, DrvInfo & b) typedef std::list 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(); } diff --git a/lix/legacy/nix-store.cc b/lix/legacy/nix-store.cc index 13cd0f1ad..d6155489b 100644 --- a/lix/legacy/nix-store.cc +++ b/lix/legacy/nix-store.cc @@ -502,7 +502,7 @@ opQuery(std::shared_ptr store, AsyncIoRoot & aio, Strings opFlags, String roots.insert(j); } } - pager << aio.blockOn(printDotGraph(ref::unsafeFromPtr(store), std::move(roots))); + pager << aio.blockOn(formatDotGraph(ref::unsafeFromPtr(store), std::move(roots))); break; } @@ -516,7 +516,7 @@ opQuery(std::shared_ptr store, AsyncIoRoot & aio, Strings opFlags, String roots.insert(j); } } - pager << aio.blockOn(printGraphML(ref::unsafeFromPtr(store), std::move(roots))); + pager << aio.blockOn(formatGraphML(ref::unsafeFromPtr(store), std::move(roots))); break; }