diff options
author | Vincent Ambo <tazjin@google.com> | 2020-05-24T21·29+0100 |
---|---|---|
committer | Vincent Ambo <tazjin@google.com> | 2020-05-24T21·29+0100 |
commit | 838f86b0fd880b26539664140f04e5d16669dad8 (patch) | |
tree | c8fee2f0c136fbe5bb0735604e2f04d5b02698ba /third_party/nix/src/libstore/builtins | |
parent | f30b2e610d9e612504a9f6460e0cc83413b80aeb (diff) |
style(3p/nix): Remove 'using std::*' from types.hh r/840
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.
Diffstat (limited to 'third_party/nix/src/libstore/builtins')
-rw-r--r-- | third_party/nix/src/libstore/builtins/buildenv.cc | 4 | ||||
-rw-r--r-- | third_party/nix/src/libstore/builtins/fetchurl.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/third_party/nix/src/libstore/builtins/buildenv.cc b/third_party/nix/src/libstore/builtins/buildenv.cc index 77ad722fab15..d14474a93d7e 100644 --- a/third_party/nix/src/libstore/builtins/buildenv.cc +++ b/third_party/nix/src/libstore/builtins/buildenv.cc @@ -133,7 +133,7 @@ static void addPkg(const Path& pkgDir, int priority) { createLinks(pkgDir, out, priority); try { - for (const auto& p : tokenizeString<std::vector<string>>( + for (const auto& p : tokenizeString<std::vector<std::string>>( readFile(pkgDir + "/nix-support/propagated-user-env-packages"), " \n")) if (!done.count(p)) { @@ -157,7 +157,7 @@ struct Package { typedef std::vector<Package> Packages; void builtinBuildenv(const BasicDerivation& drv) { - auto getAttr = [&](const string& name) { + auto getAttr = [&](const std::string& name) { auto i = drv.env.find(name); if (i == drv.env.end()) { throw Error("attribute '%s' missing", name); diff --git a/third_party/nix/src/libstore/builtins/fetchurl.cc b/third_party/nix/src/libstore/builtins/fetchurl.cc index c3f38a943f57..97260d2e5229 100644 --- a/third_party/nix/src/libstore/builtins/fetchurl.cc +++ b/third_party/nix/src/libstore/builtins/fetchurl.cc @@ -17,7 +17,7 @@ void builtinFetchurl(const BasicDerivation& drv, const std::string& netrcData) { writeFile(settings.netrcFile, netrcData, 0600); } - auto getAttr = [&](const string& name) { + auto getAttr = [&](const std::string& name) { auto i = drv.env.find(name); if (i == drv.env.end()) throw Error(format("attribute '%s' missing") % name); |