aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Ericson <git@JohnEricson.me>2019-11-10 11:23:35 -0500
committerJohn Ericson <git@JohnEricson.me>2019-11-10 11:24:47 -0500
commit4c34054673edd67cd1cfd81ab2972f27e518c78a (patch)
tree50911094428627a75d642f1ec01372354533e403
parent96e6e680c1a298613756571e4984c340ce887c2a (diff)
Remove unneeded semicolons
-rw-r--r--src/libexpr/eval.cc2
-rw-r--r--src/libutil/args.hh26
2 files changed, 14 insertions, 14 deletions
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index f60e8d3ab..34e527c52 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -432,7 +432,7 @@ Path EvalState::toRealPath(const Path & path, const PathSet & context)
!context.empty() && store->isInStore(path)
? store->toRealPath(path)
: path;
-};
+}
Value * EvalState::addConstant(const string & name, Value & v)
diff --git a/src/libutil/args.hh b/src/libutil/args.hh
index ad5fcca39..f8df39b5c 100644
--- a/src/libutil/args.hh
+++ b/src/libutil/args.hh
@@ -70,23 +70,23 @@ public:
Args & args;
Flag::ptr flag;
friend class Args;
- FlagMaker(Args & args) : args(args), flag(std::make_shared<Flag>()) { };
+ FlagMaker(Args & args) : args(args), flag(std::make_shared<Flag>()) { }
public:
~FlagMaker();
- FlagMaker & longName(const std::string & s) { flag->longName = s; return *this; };
- FlagMaker & shortName(char s) { flag->shortName = s; return *this; };
- FlagMaker & description(const std::string & s) { flag->description = s; return *this; };
- FlagMaker & label(const std::string & l) { flag->arity = 1; flag->labels = {l}; return *this; };
- FlagMaker & labels(const Strings & ls) { flag->arity = ls.size(); flag->labels = ls; return *this; };
- FlagMaker & arity(size_t arity) { flag->arity = arity; return *this; };
- FlagMaker & handler(std::function<void(std::vector<std::string>)> handler) { flag->handler = handler; return *this; };
- FlagMaker & handler(std::function<void()> handler) { flag->handler = [handler](std::vector<std::string>) { handler(); }; return *this; };
+ FlagMaker & longName(const std::string & s) { flag->longName = s; return *this; }
+ FlagMaker & shortName(char s) { flag->shortName = s; return *this; }
+ FlagMaker & description(const std::string & s) { flag->description = s; return *this; }
+ FlagMaker & label(const std::string & l) { flag->arity = 1; flag->labels = {l}; return *this; }
+ FlagMaker & labels(const Strings & ls) { flag->arity = ls.size(); flag->labels = ls; return *this; }
+ FlagMaker & arity(size_t arity) { flag->arity = arity; return *this; }
+ FlagMaker & handler(std::function<void(std::vector<std::string>)> handler) { flag->handler = handler; return *this; }
+ FlagMaker & handler(std::function<void()> handler) { flag->handler = [handler](std::vector<std::string>) { handler(); }; return *this; }
FlagMaker & handler(std::function<void(std::string)> handler) {
flag->arity = 1;
flag->handler = [handler](std::vector<std::string> ss) { handler(std::move(ss[0])); };
return *this;
- };
- FlagMaker & category(const std::string & s) { flag->category = s; return *this; };
+ }
+ FlagMaker & category(const std::string & s) { flag->category = s; return *this; }
template<class T>
FlagMaker & dest(T * dest)
@@ -94,7 +94,7 @@ public:
flag->arity = 1;
flag->handler = [=](std::vector<std::string> ss) { *dest = ss[0]; };
return *this;
- };
+ }
template<class T>
FlagMaker & set(T * dest, const T & val)
@@ -102,7 +102,7 @@ public:
flag->arity = 0;
flag->handler = [=](std::vector<std::string> ss) { *dest = val; };
return *this;
- };
+ }
FlagMaker & mkHashTypeFlag(HashType * ht);
};