maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

style(3p/nix): Remove 'using std::*' from types.hh

Browse source 
It is considered bad form to use things from includes in headers, as
these directives propagate to everywhere else and can make it
confusing.

types.hh (which is includes almost literally everywhere) had some of
these directives, which this commit removes.
This commit is contained in:
Vincent Ambo 2020-05-24 22:29:21 +01:00
parent f30b2e610d
commit 838f86b0fd
85 changed files with 859 additions and 821 deletions
Download patch file Download diff file Expand all files Collapse all files

12
third_party/nix/src/nix-store/graphml.cc vendored
View file

@ -10,23 +10,23 @@ using std::cout;
namespace nix {
static inline const string& xmlQuote(const string& s) {
static inline const std::string& xmlQuote(const std::string& s) {
// Luckily, store paths shouldn't contain any character that needs to be
// quoted.
return s;
}
static string symbolicName(const string& path) {
string p = baseNameOf(path);
return string(p, p.find('-') + 1);
static std::string symbolicName(const std::string& path) {
std::string p = baseNameOf(path);
return std::string(p, p.find('-') + 1);
}
static string makeEdge(const string& src, const string& dst) {
static std::string makeEdge(const std::string& src, const std::string& 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"
" <data key=\"narSize\">%2%</data>\n"