about summary refs log tree commit diff
path: root/third_party/nix/src/nix/command.cc
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-20T03·33+0100
committerVincent Ambo <tazjin@google.com>2020-05-20T03·33+0100
commitd331d3a0b5c497a46e2636f308234be66566c04c (patch)
tree92526b2f99456c09c5cc81233ed5a4311abe3d2b /third_party/nix/src/nix/command.cc
parentfed31b2c9b364fc1ed0b724c21b068cdedf46ee7 (diff)
refactor(3p/nix): Apply clang-tidy's modernize-* fixes r/787
This applies the modernization fixes listed here:

https://clang.llvm.org/extra/clang-tidy/checks/list.html

The 'modernize-use-trailing-return-type' fix was excluded due to my
personal preference (more specifically, I think the 'auto' keyword is
misleading in that position).
Diffstat (limited to 'third_party/nix/src/nix/command.cc')
-rw-r--r--third_party/nix/src/nix/command.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/third_party/nix/src/nix/command.cc b/third_party/nix/src/nix/command.cc
index b35fb1be9898..b0efcb823dd6 100644
--- a/third_party/nix/src/nix/command.cc
+++ b/third_party/nix/src/nix/command.cc
@@ -1,11 +1,13 @@
 #include "command.hh"
 
+#include <utility>
+
 #include "derivations.hh"
 #include "store-api.hh"
 
 namespace nix {
 
-Commands* RegisterCommand::commands = 0;
+Commands* RegisterCommand::commands = nullptr;
 
 void Command::printHelp(const string& programName, std::ostream& out) {
   Args::printHelp(programName, out);
@@ -22,7 +24,8 @@ void Command::printHelp(const string& programName, std::ostream& out) {
   }
 }
 
-MultiCommand::MultiCommand(const Commands& _commands) : commands(_commands) {
+MultiCommand::MultiCommand(Commands _commands)
+    : commands(std::move(_commands)) {
   expectedArgs.push_back(ExpectedArg{
       "command", 1, true, [=](std::vector<std::string> ss) {
         assert(!command);
@@ -82,7 +85,7 @@ bool MultiCommand::processArgs(const Strings& args, bool finish) {
   }
 }
 
-StoreCommand::StoreCommand() {}
+StoreCommand::StoreCommand() = default;
 
 ref<Store> StoreCommand::getStore() {
   if (!_store) {