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

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

Browse source 
Change-Id: I265e763393422ee1881653527c91024458060825
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1432
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
This commit is contained in:
Kane York 2020-07-24 21:09:44 -07:00 • committed by kanepyork
parent 69f402563a
commit ef54f5da9f
65 changed files with 580 additions and 497 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,9 +85,10 @@ 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);
}
@ -118,9 +119,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;
@ -196,10 +197,11 @@ 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;
}
@ -260,13 +262,14 @@ 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);