Remove C++23 dependency std::ranges::to

Author: patrickroberts

CMakeLists.txt

@@ -56,7 +56,7 @@ install(
 macro(beman_add_executable)
     set(options)
     set(oneValueArgs CATEGORY TARGET)
-    set(multiValueArgs FEATURES SOURCES LIBRARIES)
+    set(multiValueArgs SOURCES LIBRARIES)
 
     cmake_parse_arguments(
         beman_executable
@@ -75,14 +75,10 @@ macro(beman_add_executable)
         set(beman_executable_SOURCES "${beman_executable_TARGET}.cpp")
     endif()
 
-    if(NOT beman_executable_FEATURES)
-        set(${beman_executable_FEATURES} cxx_std_20)
-    endif()
-
     add_executable(${target})
     # [CMAKE.PASSIVE_PROJECTS]
     # set features on executables, not on interface library
-    target_compile_features(${target} PRIVATE ${beman_executable_FEATURES})
+    target_compile_features(${target} PRIVATE cxx_std_20)
     target_sources(${target} PRIVATE ${beman_executable_SOURCES})
     target_link_libraries(
         ${target}

tests/beman/any_view/CMakeLists.txt

@@ -29,8 +29,8 @@ function(beman_add_test)
     gtest_discover_tests(${target})
 endfunction()
 
-beman_add_benchmark(TARGET all SOURCES all.benchmark.cpp detail/eager.cpp detail/fused.cpp detail/lazy.cpp detail/products.cpp FEATURES cxx_std_23)
-beman_add_benchmark(TARGET take SOURCES take.benchmark.cpp detail/eager.cpp detail/fused.cpp detail/lazy.cpp detail/products.cpp FEATURES cxx_std_23)
+beman_add_benchmark(TARGET all SOURCES all.benchmark.cpp detail/eager.cpp detail/fused.cpp detail/lazy.cpp detail/products.cpp)
+beman_add_benchmark(TARGET take SOURCES take.benchmark.cpp detail/eager.cpp detail/fused.cpp detail/lazy.cpp detail/products.cpp)
 
 beman_add_test(TARGET concepts SOURCES concepts.test.cpp)
 beman_add_test(TARGET constexpr SOURCES constexpr.test.cpp)

tests/beman/any_view/all.benchmark.cpp

@@ -17,7 +17,10 @@ inline void use(std::string_view name) {
 }
 
 static void BM_all_eager(benchmark::State& state) {
-    eager::database db{global_products | std::views::take(state.range(0)) | std::ranges::to<std::vector>()};
+    const auto size  = state.range(0);
+    const auto begin = global_products.begin();
+
+    eager::database db{.products = {begin, begin + size}};
 
     for (auto _ : state) {
         for (std::string_view name : db.get_products({.min_quantity = 10})) {
@@ -27,7 +30,10 @@ static void BM_all_eager(benchmark::State& state) {
 }
 
 static void BM_all_fused(benchmark::State& state) {
-    fused::database db{global_products | std::views::take(state.range(0)) | std::ranges::to<std::vector>()};
+    const auto size  = state.range(0);
+    const auto begin = global_products.begin();
+
+    fused::database db{.products = {begin, begin + size}};
 
     for (auto _ : state) {
         for (std::string_view name : db.get_products({.min_quantity = 10})) {
@@ -37,7 +43,10 @@ static void BM_all_fused(benchmark::State& state) {
 }
 
 static void BM_all_lazy(benchmark::State& state) {
-    lazy::database db{global_products | std::views::take(state.range(0)) | std::ranges::to<std::vector>()};
+    const auto size  = state.range(0);
+    const auto begin = global_products.begin();
+
+    lazy::database db{.products = {begin, begin + size}};
 
     for (auto _ : state) {
         for (std::string_view name : db.get_products({.min_quantity = 10})) {

tests/beman/any_view/detail/products.cpp

@@ -30,10 +30,10 @@ auto generate_random_products(std::size_t count) -> std::vector<product_t> {
     std::mt19937                       w_rng;
     std::uniform_int_distribution<int> w_dist(0, 100);
 
-    const auto gen_size = [&] { return w_dist(w_rng); };
+    const auto gen_size = [&]() -> std::size_t { return w_dist(w_rng); };
 
     for (std::size_t i = 0; i < results.capacity(); ++i) {
-        results.emplace_back(gen_next_str(), gen_size());
+        results.push_back(product_t{.name = gen_next_str(), .quantity = gen_size()});
     }
 
     return results;

tests/beman/any_view/take.benchmark.cpp

@@ -17,7 +17,10 @@ inline void use(std::string_view name) {
 }
 
 static void BM_take_eager(benchmark::State& state) {
-    eager::database db{global_products | std::views::take(state.range(0)) | std::ranges::to<std::vector>()};
+    const auto size  = state.range(0);
+    const auto begin = global_products.begin();
+
+    eager::database db{.products = {begin, begin + size}};
 
     for (auto _ : state) {
         for (std::string_view name : db.get_products({.min_quantity = 10}) | std::views::take(100)) {
@@ -27,7 +30,10 @@ static void BM_take_eager(benchmark::State& state) {
 }
 
 static void BM_take_fused(benchmark::State& state) {
-    fused::database db{global_products | std::views::take(state.range(0)) | std::ranges::to<std::vector>()};
+    const auto size  = state.range(0);
+    const auto begin = global_products.begin();
+
+    fused::database db{.products = {begin, begin + size}};
 
     for (auto _ : state) {
         for (std::string_view name : db.get_products({.min_quantity = 10}) | std::views::take(100)) {
@@ -37,7 +43,10 @@ static void BM_take_fused(benchmark::State& state) {
 }
 
 static void BM_take_lazy(benchmark::State& state) {
-    lazy::database db{global_products | std::views::take(state.range(0)) | std::ranges::to<std::vector>()};
+    const auto size  = state.range(0);
+    const auto begin = global_products.begin();
+
+    lazy::database db{.products = {begin, begin + size}};
 
     for (auto _ : state) {
         for (std::string_view name : db.get_products({.min_quantity = 10}) | std::views::take(100)) {