cleanup after review

2 files changed, 5 insertions, 7 deletions

diff --git a/eval/src/vespa/eval/instruction/generic_concat.cpp b/eval/src/vespa/eval/instruction/generic_concat.cpp
index 64a7e228f0c..cf4a98b004e 100644
--- a/eval/src/vespa/eval/instruction/generic_concat.cpp
+++ b/eval/src/vespa/eval/instruction/generic_concat.cpp
@@ -177,12 +177,10 @@ DenseConcatPlan::DenseConcatPlan(const ValueType &lhs_type,
                                  std::string concat_dimension,
                                  const ValueType &out_type)
 {
-    auto left_p = left.fill_from(lhs_type, concat_dimension, out_type);
-    auto right_p = right.fill_from(rhs_type, concat_dimension, out_type);
-    right_offset = left_p.first;
-    output_size = left_p.second;
-    assert(right_p.first > 0);
-    assert(output_size == right_p.second);
+    std::tie(right_offset, output_size) = left.fill_from(lhs_type, concat_dimension, out_type);
+    auto [ other_offset, other_size ] = right.fill_from(rhs_type, concat_dimension, out_type);
+    assert(other_offset > 0);
+    assert(output_size == other_size);
 }
 
 DenseConcatPlan::~DenseConcatPlan() = default;
diff --git a/eval/src/vespa/eval/instruction/generic_concat.h b/eval/src/vespa/eval/instruction/generic_concat.h
index 6902ca4c774..5578c5a0dca 100644
--- a/eval/src/vespa/eval/instruction/generic_concat.h
+++ b/eval/src/vespa/eval/instruction/generic_concat.h
@@ -27,7 +27,7 @@ struct DenseConcatPlan {
         std::vector<size_t> in_loop_cnt;
         std::vector<size_t> in_stride;
         std::vector<size_t> out_stride;
-        // returns computed "right_offset" and "output_size":
+        // returns computed concat offset and output size
         std::pair<size_t, size_t> fill_from(const ValueType &in_type,
                                             std::string concat_dimension,
                                             const ValueType &out_type);