cosmetic cleanups

4 files changed, 4 insertions, 7 deletions

diff --git a/searchlib/src/tests/features/tensor_from_labels/tensor_from_labels_test.cpp b/searchlib/src/tests/features/tensor_from_labels/tensor_from_labels_test.cpp
index 80c98284b82..33fd7c856b3 100644
--- a/searchlib/src/tests/features/tensor_from_labels/tensor_from_labels_test.cpp
+++ b/searchlib/src/tests/features/tensor_from_labels/tensor_from_labels_test.cpp
@@ -121,8 +121,7 @@ struct ExecFixture
         test.getQueryEnv().getProperties().add("aint_query", "[11 13 17]");
     }
     const Value &extractTensor(uint32_t docid) {
-        Value::CREF value = test.resolveObjectFeature(docid);
-        return value.get();
+        return test.resolveObjectFeature(docid);
     }
     const Value &execute() {
         return extractTensor(1);
diff --git a/searchlib/src/tests/features/tensor_from_weighted_set/tensor_from_weighted_set_test.cpp b/searchlib/src/tests/features/tensor_from_weighted_set/tensor_from_weighted_set_test.cpp
index d3909223907..282c8134754 100644
--- a/searchlib/src/tests/features/tensor_from_weighted_set/tensor_from_weighted_set_test.cpp
+++ b/searchlib/src/tests/features/tensor_from_weighted_set/tensor_from_weighted_set_test.cpp
@@ -120,8 +120,7 @@ struct ExecFixture
         test.getQueryEnv().getProperties().add("wsquery", "{d:11,e:13,f:17}");
     }
     const Value &extractTensor(uint32_t docid) {
-        Value::CREF value = test.resolveObjectFeature(docid);
-        return value.get();
+        return test.resolveObjectFeature(docid);
     }
     const Value &execute() {
         return extractTensor(1);
diff --git a/searchlib/src/tests/queryeval/nearest_neighbor/nearest_neighbor_test.cpp b/searchlib/src/tests/queryeval/nearest_neighbor/nearest_neighbor_test.cpp
index 153e3cf45cc..f6ca0bd1427 100644
--- a/searchlib/src/tests/queryeval/nearest_neighbor/nearest_neighbor_test.cpp
+++ b/searchlib/src/tests/queryeval/nearest_neighbor/nearest_neighbor_test.cpp
@@ -41,8 +41,7 @@ DistanceFunction::UP euclid_d = search::tensor::make_distance_function(DistanceM
 DistanceFunction::UP euclid_f = search::tensor::make_distance_function(DistanceMetric::Euclidean, CellType::FLOAT);
 
 std::unique_ptr<Value> createTensor(const TensorSpec &spec) {
-    auto value = EngineOrFactory::get().from_spec(spec);
-    return value;
+    return EngineOrFactory::get().from_spec(spec);
 }
 
 std::unique_ptr<Value> createTensor(const vespalib::string& type_spec, double v1, double v2) {
diff --git a/searchlib/src/vespa/searchlib/queryeval/fake_requestcontext.h b/searchlib/src/vespa/searchlib/queryeval/fake_requestcontext.h
index 96fb2968188..c3f9685e47c 100644
--- a/searchlib/src/vespa/searchlib/queryeval/fake_requestcontext.h
+++ b/searchlib/src/vespa/searchlib/queryeval/fake_requestcontext.h
@@ -37,7 +37,7 @@ public:
         if (_query_tensor && (tensor_name == _query_tensor_name)) {
             return vespalib::eval::EngineOrFactory::get().from_spec(*_query_tensor);
         }
-        return vespalib::eval::Value::UP();
+        return {};
     }
     void set_query_tensor(const vespalib::string& name, const vespalib::eval::TensorSpec& tensor_spec) {
         _query_tensor_name = name;