1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-12-10 11:01:03 +01:00

Merge remote-tracking branch 'upstream/master' into path-info

This commit is contained in:
John Ericson 2022-03-10 15:48:14 +00:00
commit 8ba089597f
434 changed files with 23391 additions and 36322 deletions

View file

@ -19,20 +19,20 @@ static inline std::string_view xmlQuote(std::string_view s)
}
static string symbolicName(const std::string & p)
static std::string symbolicName(std::string_view p)
{
return string(p, p.find('-') + 1);
return std::string(p.substr(0, p.find('-') + 1));
}
static string makeEdge(std::string_view src, std::string_view dst)
static std::string makeEdge(std::string_view src, std::string_view dst)
{
return fmt(" <edge source=\"%1%\" target=\"%2%\"/>\n",
xmlQuote(src), xmlQuote(dst));
}
static string makeNode(const ValidPathInfo & info)
static std::string makeNode(const ValidPathInfo & info)
{
return fmt(
" <node id=\"%1%\">\n"