std::move and = default.

2 files changed, 4 insertions, 7 deletions

diff --git a/searchlib/src/vespa/searchlib/fef/parametervalidator.h b/searchlib/src/vespa/searchlib/fef/parametervalidator.h
index 6e0fd7199c8..12044905dd0 100644
--- a/searchlib/src/vespa/searchlib/fef/parametervalidator.h
+++ b/searchlib/src/vespa/searchlib/fef/parametervalidator.h
@@ -7,8 +7,7 @@
 #include "parameter.h"
 #include "parameterdescriptions.h"
 
-namespace search {
-namespace fef {
+namespace search::fef {
 
 /**
  * This class is a validator for a string parameter list given an index environment and a set of parameter descriptions.
@@ -83,6 +82,4 @@ public:
     Result validate();
 };
 
-} // namespace fef
-} // namespace search
-
+}
diff --git a/searchlib/src/vespa/searchlib/fef/rank_program.cpp b/searchlib/src/vespa/searchlib/fef/rank_program.cpp
index 80729d90bf5..d39be693806 100644
--- a/searchlib/src/vespa/searchlib/fef/rank_program.cpp
+++ b/searchlib/src/vespa/searchlib/fef/rank_program.cpp
@@ -153,7 +153,7 @@ RankProgram::resolve(const BlueprintResolver::FeatureMap &features, bool unbox_s
 }
 
 RankProgram::RankProgram(BlueprintResolver::SP resolver)
-    : _resolver(resolver),
+    : _resolver(std::move(resolver)),
       _hot_stash(32768),
       _cold_stash(),
       _executors(),
@@ -162,7 +162,7 @@ RankProgram::RankProgram(BlueprintResolver::SP resolver)
 {
 }
 
-RankProgram::~RankProgram() {}
+RankProgram::~RankProgram() = default;
 
 void
 RankProgram::setup(const MatchData &md,