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

refactor(3p/nix/libexpr): Use std::string as qualified type

Browse source 
Replaces most uses of `string` with `std::string`.

This came up because I removed the "types.hh" import from
"symbol-table.hh", which percolated through a bunch of files where
`string` was suddenly no longer defined ... *sigh*
This commit is contained in:
Vincent Ambo 2020-05-21 05:43:22 +01:00
parent b97307056d
commit a162f4e825
26 changed files with 196 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

6
third_party/nix/src/libexpr/primops/context.cc vendored
View file

@ -7,7 +7,7 @@ namespace nix {
static void prim_unsafeDiscardStringContext(EvalState& state, const Pos& pos,
Value** args, Value& v) {
PathSet context;
string s = state.coerceToString(pos, *args[0], context);
std::string s = state.coerceToString(pos, *args[0], context);
mkString(v, s, PathSet());
}
@ -32,7 +32,7 @@ static RegisterPrimOp r2("__hasContext", 1, prim_hasContext);
static void prim_unsafeDiscardOutputDependency(EvalState& state, const Pos& pos,
Value** args, Value& v) {
PathSet context;
string s = state.coerceToString(pos, *args[0], context);
std::string s = state.coerceToString(pos, *args[0], context);
PathSet context2;
for (auto& p : context) {
@ -76,7 +76,7 @@ static void prim_getContext(EvalState& state, const Pos& pos, Value** args,
auto contextInfos = std::map<Path, ContextInfo>();
for (const auto& p : context) {
Path drv;
string output;
std::string output;
const Path* path = &p;
if (p.at(0) == '=') {
drv = string(p, 1);

2
third_party/nix/src/libexpr/primops/fetchGit.cc vendored
View file

@ -215,7 +215,7 @@ static void prim_fetchGit(EvalState& state, const Pos& pos, Value** args,
state.forceAttrs(*args[0], pos);
for (auto& attr : *args[0]->attrs) {
string n(attr.name);
std::string n(attr.name);
if (n == "url")
url =
state.coerceToString(*attr.pos, *attr.value, context, false, false);

4
third_party/nix/src/libexpr/primops/fetchMercurial.cc vendored
View file

@ -102,7 +102,7 @@ HgInfo exportMercurial(ref<Store> store, const std::string& uri,
try {
runProgram("hg", true, {"pull", "-R", cacheDir, "--", uri});
} catch (ExecError& e) {
string transJournal = cacheDir + "/.hg/store/journal";
std::string transJournal = cacheDir + "/.hg/store/journal";
/* hg throws "abandoned transaction" error only if this file exists */
if (pathExists(transJournal)) {
runProgram("hg", true, {"recover", "-R", cacheDir});
@ -191,7 +191,7 @@ static void prim_fetchMercurial(EvalState& state, const Pos& pos, Value** args,
state.forceAttrs(*args[0], pos);
for (auto& attr : *args[0]->attrs) {
string n(attr.name);
std::string n(attr.name);
if (n == "url")
url =
state.coerceToString(*attr.pos, *attr.value, context, false, false);