From e0bf3ece6ec91d4d73f05b65afe89d8f5b3fca06 Mon Sep 17 00:00:00 2001
From: Ben Deane <ben@elbeno.com>
Date: Fri, 26 Sep 2025 13:12:02 -0600
Subject: [PATCH] :rotating_light: Fix warnings arising from `-Wnrvo`

Problem:
- `stdx` is not warning free with respect to `-Wnrvo`.

Solution:
- Add some trailing return types etc to fix warnings.
---
 include/stdx/bit.hpp              | 18 +++++++++++-------
 include/stdx/ct_format.hpp        | 20 ++++++++++++--------
 include/stdx/tuple.hpp            | 18 ++++++++++--------
 include/stdx/tuple_algorithms.hpp | 19 +++++++++++--------
 4 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/include/stdx/bit.hpp b/include/stdx/bit.hpp
index 3706177..44e8d90 100644
--- a/include/stdx/bit.hpp
+++ b/include/stdx/bit.hpp
@@ -334,11 +334,13 @@ template <typename To, typename From> constexpr auto bit_unpack(From arg) {
                   "bit_unpack is undefined for those types");
 
     constexpr auto sz = sized<From>{1}.template in<To>();
-    auto r = bit_cast<std::array<To, sz>>(to_be(arg));
-    for (auto &elem : r) {
-        elem = from_be(elem);
-    }
-    return r;
+    return [&]() -> std::array<To, sz> {
+        auto r = bit_cast<std::array<To, sz>>(to_be(arg));
+        for (auto &elem : r) {
+            elem = from_be(elem);
+        }
+        return r;
+    }();
 }
 
 namespace detail {
@@ -436,14 +438,16 @@ template <std::size_t N> using smallest_uint_t = decltype(smallest_uint<N>());
 
 namespace bit_detail {
 template <std::size_t... Offsets>
-constexpr auto shifts = [] {
+constexpr auto shifts =
+    []() -> std::array<std::size_t, sizeof...(Offsets) + 1> {
     constexpr auto offsets = std::array{std::size_t{}, Offsets...};
     auto s = std::array<std::size_t, sizeof...(Offsets) + 1>{};
     for (auto i = std::size_t{}; i < sizeof...(Offsets); ++i) {
         s[i + 1] = offsets[i + 1] - offsets[i];
     }
     return s;
-}();
+}
+();
 
 template <std::size_t Shift, std::size_t Msb, typename T>
 constexpr auto shift_extract(T &t) -> T {
diff --git a/include/stdx/ct_format.hpp b/include/stdx/ct_format.hpp
index 6fdd687..3427bdb 100644
--- a/include/stdx/ct_format.hpp
+++ b/include/stdx/ct_format.hpp
@@ -106,7 +106,9 @@ CONSTEVAL auto count_specifiers(std::string_view fmt) -> std::size_t {
     return count;
 }
 
-template <std::size_t N> CONSTEVAL auto split_specifiers(std::string_view fmt) {
+template <std::size_t N>
+CONSTEVAL auto split_specifiers(std::string_view fmt)
+    -> std::array<std::string_view, N> {
     auto splits = std::array<std::string_view, N>{};
     auto count = std::size_t{};
 
@@ -196,24 +198,26 @@ CONSTEVAL auto convert_output() {
     }
 }
 
+template <std::size_t N>
+CONSTEVAL auto perform_format(auto s, auto v) -> ct_string<N + 1> {
+    ct_string<N + 1> cts{};
+    fmt::format_to(cts.begin(), s, v);
+    return cts;
+}
+
 template <ct_string Fmt, typename Arg> constexpr auto format1(Arg arg) {
     if constexpr (requires { arg_value(arg); }) {
         constexpr auto fmtstr = FMT_COMPILE(std::string_view{Fmt});
         constexpr auto a = arg_value(arg);
-        auto const f = []<std::size_t N>(auto s, auto v) {
-            ct_string<N + 1> cts{};
-            fmt::format_to(cts.begin(), s, v);
-            return cts;
-        };
         if constexpr (is_specialization_of_v<std::remove_cv_t<decltype(a)>,
                                              format_result>) {
             constexpr auto s = convert_input(a.str);
             constexpr auto sz = fmt::formatted_size(fmtstr, s);
-            constexpr auto cts = f.template operator()<sz>(fmtstr, s);
+            constexpr auto cts = perform_format<sz>(fmtstr, s);
             return format_result{cts_t<cts>{}, a.args};
         } else {
             constexpr auto sz = fmt::formatted_size(fmtstr, a);
-            constexpr auto cts = f.template operator()<sz>(fmtstr, a);
+            constexpr auto cts = perform_format<sz>(fmtstr, a);
             return format_result{cts_t<cts>{}};
         }
     } else if constexpr (is_specialization_of_v<Arg, format_result>) {
diff --git a/include/stdx/tuple.hpp b/include/stdx/tuple.hpp
index 9f2501a..b037e15 100644
--- a/include/stdx/tuple.hpp
+++ b/include/stdx/tuple.hpp
@@ -369,14 +369,16 @@ struct tuple_impl<std::index_sequence<Is...>, index_function_list<Fs...>, Ts...>
             using C =
                 std::common_comparison_category_t<decltype(lhs[index<Is>] <=>
                                                            rhs[index<Is>])...>;
-            C result = lhs[index<0>] <=> rhs[index<0>];
-            auto const compare_at = [&]<std::size_t I>() {
-                result = lhs[index<I>] <=> rhs[index<I>];
-                return result != 0;
-            };
-            [[maybe_unused]] auto b =
-                (compare_at.template operator()<Is>() or ...);
-            return result;
+            return [&]() -> C {
+                C result = lhs[index<0>] <=> rhs[index<0>];
+                auto const compare_at = [&]<std::size_t I>() {
+                    result = lhs[index<I>] <=> rhs[index<I>];
+                    return result != 0;
+                };
+                [[maybe_unused]] auto b =
+                    (compare_at.template operator()<Is>() or ...);
+                return result;
+            }();
         }
     }
 };
diff --git a/include/stdx/tuple_algorithms.hpp b/include/stdx/tuple_algorithms.hpp
index 5c302a6..2f4e452 100644
--- a/include/stdx/tuple_algorithms.hpp
+++ b/include/stdx/tuple_algorithms.hpp
@@ -20,7 +20,8 @@ template <typename F, tuplelike... Ts> constexpr auto apply(F &&f, Ts &&...ts) {
     constexpr auto total_num_elements =
         (std::size_t{} + ... + stdx::tuple_size_v<std::remove_cvref_t<Ts>>);
 
-    [[maybe_unused]] constexpr auto element_indices = [&] {
+    [[maybe_unused]] constexpr auto element_indices =
+        [&]() -> std::array<detail::index_pair, total_num_elements> {
         std::array<detail::index_pair, total_num_elements> indices{};
         [[maybe_unused]] auto p = indices.data();
         ((p = std::remove_cvref_t<Ts>::fill_inner_indices(p)), ...);
@@ -48,7 +49,8 @@ template <tuplelike... Ts> [[nodiscard]] constexpr auto tuple_cat(Ts &&...ts) {
         constexpr auto total_num_elements =
             (std::size_t{} + ... + stdx::tuple_size_v<std::remove_cvref_t<Ts>>);
 
-        [[maybe_unused]] constexpr auto element_indices = [&] {
+        [[maybe_unused]] constexpr auto element_indices =
+            [&]() -> std::array<detail::index_pair, total_num_elements> {
             std::array<detail::index_pair, total_num_elements> indices{};
             auto p = indices.data();
             ((p = std::remove_cvref_t<Ts>::fill_inner_indices(p)), ...);
@@ -112,7 +114,7 @@ template <template <typename T> typename Pred, tuplelike T>
             (std::size_t{} + ... +
              (Pred<stdx::tuple_element_t<Is, tuple_t>>::value ? std::size_t{1}
                                                               : std::size_t{}));
-        constexpr auto indices = [] {
+        constexpr auto indices = []() -> std::array<std::size_t, num_matches> {
             auto a = std::array<std::size_t, num_matches>{};
             [[maybe_unused]] auto it = a.begin();
             [[maybe_unused]] auto copy_index =
@@ -286,7 +288,8 @@ struct chunk {
 
 template <tuplelike T, template <typename> typename Proj = std::type_identity_t>
     requires(tuple_size_v<T> > 1)
-[[nodiscard]] constexpr auto create_chunks() {
+[[nodiscard]] constexpr auto create_chunks()
+    -> std::array<chunk, count_chunks<T, Proj>()> {
     auto index = std::size_t{};
     std::array<chunk, count_chunks<T, Proj>()> chunks{};
     ++chunks[index].size;
@@ -410,11 +413,11 @@ template <template <typename> typename Proj = std::type_identity_t,
                         sorted_idxs[Is], sorted_idxs[Is + 1]>...};
             }(std::make_index_sequence<stdx::tuple_size_v<tuple_t> - 1>{});
 
-        constexpr auto chunks = [&] {
-            constexpr auto chunk_count =
-                std::count(std::begin(tests), std::end(tests), false) + 1;
+        constexpr auto chunk_count =
+            std::count(std::begin(tests), std::end(tests), false) + 1;
+        constexpr auto chunks =
+            [&]() -> std::array<detail::chunk, chunk_count> {
             std::array<detail::chunk, chunk_count> cs{};
-
             auto index = std::size_t{};
             ++cs[index].size;
             for (auto i = std::size_t{}; i < std::size(tests); ++i) {