fix(3p/nix): Fix all remaining compiler warnings
This compiles under `-Wall -Werror`. The largest chunk of this change is `final` qualifiers for the various Nix CLI command structs, which inherit from a Command class that has more virtual functions than are implemented by each command. Change-Id: I0925e6e1a39013f026773db5816e4a77d50f3b4a Reviewed-on: https://cl.tvl.fyi/c/depot/+/1294 Tested-by: BuildkiteCI Reviewed-by: isomer <isomer@tvl.fyi> Reviewed-by: kanepyork <rikingcoding@gmail.com>
This commit is contained in:
parent
ca50fb66d2
commit
15afa8472e
33 changed files with 66 additions and 39 deletions
1
third_party/nix/src/libexpr/eval.cc
vendored
1
third_party/nix/src/libexpr/eval.cc
vendored
|
|
@ -1252,7 +1252,6 @@ void EvalState::concatLists(Value& v, const NixList& lists, const Pos& pos) {
|
|||
|
||||
auto outlist = new (GC) NixList();
|
||||
|
||||
size_t len = 0;
|
||||
for (Value* list : lists) {
|
||||
forceList(*list, pos);
|
||||
outlist->insert(outlist->end(), list->list->begin(), list->list->end());
|
||||
|
|
|
|||
11
third_party/nix/src/libexpr/parser.hh
vendored
11
third_party/nix/src/libexpr/parser.hh
vendored
|
|
@ -34,6 +34,15 @@ struct ParseData : public gc {
|
|||
sLetBody(symbols.Create("<let-body>")){};
|
||||
};
|
||||
|
||||
// Clang fails to identify these functions as used, probably because
|
||||
// of some interaction between the lexer/parser codegen and something
|
||||
// else.
|
||||
//
|
||||
// To avoid warnings for that we disable -Wunused-function in this block.
|
||||
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Wunused-function"
|
||||
|
||||
// TODO(tazjin): move dupAttr to anonymous namespace
|
||||
static void dupAttr(const AttrPath& attrPath, const Pos& pos,
|
||||
const Pos& prevPos) {
|
||||
|
|
@ -85,4 +94,6 @@ static Expr* unescapeStr(SymbolTable& symbols, const char* s, size_t length) {
|
|||
return new ExprString(symbols.Create(t));
|
||||
}
|
||||
|
||||
#pragma clang diagnostic pop // re-enable -Wunused-function
|
||||
|
||||
} // namespace nix
|
||||
|
|
|
|||
5
third_party/nix/src/libexpr/parser.y
vendored
5
third_party/nix/src/libexpr/parser.y
vendored
|
|
@ -11,7 +11,10 @@
|
|||
%expect 1
|
||||
%expect-rr 1
|
||||
|
||||
%code requires { #include "libexpr/parser.hh" }
|
||||
%code requires {
|
||||
#define YY_NO_INPUT 1 // disable unused yyinput features
|
||||
#include "libexpr/parser.hh"
|
||||
}
|
||||
|
||||
%{
|
||||
|
||||
|
|
|
|||
2
third_party/nix/src/libexpr/primops.cc
vendored
2
third_party/nix/src/libexpr/primops.cc
vendored
|
|
@ -1680,8 +1680,6 @@ static void prim_partition(EvalState& state, const Pos& pos, Value** args,
|
|||
state.forceFunction(*args[0], pos);
|
||||
state.forceList(*args[1], pos);
|
||||
|
||||
auto len = args[1]->listSize();
|
||||
|
||||
NixList* right = new (GC) NixList();
|
||||
NixList* wrong = new (GC) NixList();
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue