wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-06 09:11:47 +02:00
Code Activity

Remove std::string alias (for real this time)

Browse source 
Also use std::string_view in a few more places.
This commit is contained in:
Eelco Dolstra 2022-02-25 16:00:00 +01:00
parent 14b38d0887
commit df552ff53e
110 changed files with 773 additions and 681 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/nix-store/dotgraph.cc
View file

@ -10,37 +10,35 @@ using std::cout;
namespace nix {
static string dotQuote(std::string_view s)
static std::string dotQuote(std::string_view s)
{
return "\"" + std::string(s) + "\"";
}
static string nextColour()
static const std::string & nextColour()
{
static int n = 0;
static string colours[] =
static std::vector<std::string> colours
{ "black", "red", "green", "blue"
, "magenta", "burlywood" };
return colours[n++ % (sizeof(colours) / sizeof(string))];
return colours[n++ % colours.size()];
}
static string makeEdge(const string & src, const string & dst)
static std::string makeEdge(std::string_view src, std::string_view dst)
{
format f = format("%1% -> %2% [color = %3%];\n")
% dotQuote(src) % dotQuote(dst) % dotQuote(nextColour());
return f.str();
return fmt("%1% -> %2% [color = %3%];\n",
dotQuote(src), dotQuote(dst), dotQuote(nextColour()));
}
static string makeNode(const string & id, std::string_view label,
const string & colour)
static std::string makeNode(std::string_view id, std::string_view label,
std::string_view colour)
{
format f = format("%1% [label = %2%, shape = box, "
"style = filled, fillcolor = %3%];\n")
% dotQuote(id) % dotQuote(label) % dotQuote(colour);
return f.str();
return fmt("%1% [label = %2%, shape = box, "
"style = filled, fillcolor = %3%];\n",
dotQuote(id), dotQuote(label), dotQuote(colour));
}