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

13
third_party/nix/src/libexpr/nixexpr.cc vendored
View file

@ -16,7 +16,7 @@ std::ostream& operator<<(std::ostream& str, const Expr& e) {
static void showString(std::ostream& str, const std::string& s) {
str << '"';
for (auto c : (string)s) {
for (auto c : (std::string)s) {
if (c == '"' || c == '\\' || c == '$') {
str << "\\" << c;
} else if (c == '\n') {
@ -188,14 +188,14 @@ std::ostream& operator<<(std::ostream& str, const Pos& pos) {
if (!pos) {
str << "undefined position";
} else {
str << (format(ANSI_BOLD "%1%" ANSI_NORMAL ":%2%:%3%") % (string)pos.file %
pos.line % pos.column)
str << (format(ANSI_BOLD "%1%" ANSI_NORMAL ":%2%:%3%") %
(std::string)pos.file % pos.line % pos.column)
.str();
}
return str;
}
string showAttrPath(const AttrPath& attrPath) {
std::string showAttrPath(const AttrPath& attrPath) {
std::ostringstream out;
bool first = true;
for (auto& i : attrPath) {
@ -407,9 +407,10 @@ void ExprLambda::setName(Symbol& name) {
body->setName(name);
}
string ExprLambda::showNamePos() const {
std::string ExprLambda::showNamePos() const {
return (format("%1% at %2%") %
(name.set() ? "'" + (string)name + "'" : "anonymous function") % pos)
(name.set() ? "'" + (std::string)name + "'" : "anonymous function") %
pos)
.str();
}