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

fix(3p/nix): revert "apply all clang-tidy fixes"

Browse source 
This reverts commit ef54f5da9f.

Resolved conflicts:
	third_party/nix/src/libexpr/eval.cc
	third_party/nix/src/libstore/builtins/fetchurl.cc
	third_party/nix/src/libstore/references.cc
	third_party/nix/src/libutil/hash.cc
	third_party/nix/src/nix-daemon/nix-daemon.cc

Change-Id: Ib9cf6e96a79a23bde3983579ced3f92e530cb011
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1547
Reviewed-by: glittershark <grfn@gws.fyi>
Tested-by: BuildkiteCI
This commit is contained in:
Kane York 2020-08-01 15:32:00 -07:00 • committed by kanepyork
parent cc3c45f739
commit 72fc2fd27e
64 changed files with 479 additions and 555 deletions
Download patch file Download diff file Expand all files Collapse all files

19
third_party/nix/src/libexpr/parser.cc vendored
View file

@ -85,10 +85,9 @@ void addAttr(ExprAttrs* attrs, AttrPath& attrPath, Expr* e, const Pos& pos) {
}
void addFormal(const Pos& pos, Formals* formals, const Formal& formal) {
if (formals->argNames.find(formal.name) != formals->argNames.end()) {
if (formals->argNames.find(formal.name) != formals->argNames.end())
throw ParseError(format("duplicate formal function argument '%1%' at %2%") %
formal.name % pos);
}
formals->formals.push_front(formal);
formals->argNames.insert(formal.name);
}
@ -119,9 +118,9 @@ Expr* stripIndentation(const Pos& pos, SymbolTable& symbols,
}
for (size_t j = 0; j < e->s.size(); ++j) {
if (atStartOfLine) {
if (e->s[j] == ' ') {
if (e->s[j] == ' ')
curIndent++;
} else if (e->s[j] == '\n') {
else if (e->s[j] == '\n') {
/* Empty line, doesn't influence minimum
indentation. */
curIndent = 0;
@ -197,11 +196,10 @@ Path resolveExprPath(Path path) {
/* If `path' is a symlink, follow it. This is so that relative
path references work. */
struct stat st {};
struct stat st;
while (true) {
if (lstat(path.c_str(), &st)) {
if (lstat(path.c_str(), &st))
throw SysError(format("getting status of '%1%'") % path);
}
if (!S_ISLNK(st.st_mode)) {
break;
}
@ -262,14 +260,13 @@ Path EvalState::findFile(SearchPath& searchPath, const std::string& path,
const Pos& pos) {
for (auto& i : searchPath) {
std::string suffix;
if (i.first.empty()) {
if (i.first.empty())
suffix = "/" + path;
} else {
else {
auto s = i.first.size();
if (path.compare(0, s, i.first) != 0 ||
(path.size() > s && path[s] != '/')) {
(path.size() > s && path[s] != '/'))
continue;
}
suffix = path.size() == s ? "" : "/" + std::string(path, s);
}
auto r = resolveSearchPathElem(i);