use range algorithms where appropriate

Author: ericniebler

include/exec/static_thread_pool.hpp

@@ -759,8 +759,7 @@ namespace experimental::execution
                                     .thread_index = index});
       }
 
-      // NOLINTNEXTLINE(modernize-use-ranges) we still support platforms without the std::ranges algorithms
-      std::sort(thread_index_by_numa_node_.begin(), thread_index_by_numa_node_.end());
+      std::ranges::sort(thread_index_by_numa_node_);
       std::vector<workstealing_victim> victims{};
       for (auto& state: thread_states_)
       {
@@ -836,15 +835,12 @@ namespace experimental::execution
     inline auto _static_thread_pool::num_threads(int numa) const noexcept -> std::size_t
     {
       thread_index_by_numa_node key{.numa_node = numa, .thread_index = 0};
-      // NOLINTNEXTLINE(modernize-use-ranges) we still support platforms without the std::ranges algorithms
-      auto it = std::lower_bound(thread_index_by_numa_node_.begin(),
-                                 thread_index_by_numa_node_.end(),
-                                 key);
+      auto                      it = std::ranges::lower_bound(thread_index_by_numa_node_, key);
       if (it == thread_index_by_numa_node_.end())
       {
         return 0;
       }
-      auto it_end = std::upper_bound(it, thread_index_by_numa_node_.end(), key);
+      auto it_end = std::ranges::upper_bound(it, thread_index_by_numa_node_.end(), key);
       return static_cast<std::size_t>(std::distance(it, it_end));
     }
 
@@ -870,10 +866,7 @@ namespace experimental::execution
       -> std::size_t
     {
       thread_index_by_numa_node key{.numa_node = node_index, .thread_index = 0};
-      // NOLINTNEXTLINE(modernize-use-ranges) we still support platforms without the std::ranges algorithms
-      auto it = std::lower_bound(thread_index_by_numa_node_.begin(),
-                                 thread_index_by_numa_node_.end(),
-                                 key);
+      auto                      it = std::ranges::lower_bound(thread_index_by_numa_node_, key);
       STDEXEC_ASSERT(it != thread_index_by_numa_node_.end());
       std::advance(it, thread_index);
       return it->thread_index;

include/nvexec/stream/algorithm_base.cuh

@@ -18,9 +18,10 @@
 
 #pragma once
 
-#include "../../stdexec/__detail/__ranges.hpp"
 #include "../../stdexec/execution.hpp"
+
 #include <cstddef>
+#include <ranges>
 
 #include <cuda/std/type_traits>
 
@@ -32,7 +33,7 @@ namespace nv::execution::_strm::__algo_range_init_fun
 {
   template <class Range, class InitT, class Fun>
   using binary_invoke_result_t = ::cuda::std::decay_t<
-    ::cuda::std::invoke_result_t<Fun, STDEXEC::ranges::range_reference_t<Range>, InitT>>;
+    ::cuda::std::invoke_result_t<Fun, std::ranges::range_reference_t<Range>, InitT>>;
 
   template <class Sender, class Receiver, class InitT, class Fun, class DerivedReceiver>
   struct receiver : public stream_receiver_base

include/stdexec/__detail/__deprecations.hpp

@@ -16,6 +16,7 @@
 #pragma once
 
 #include "__execution_fwd.hpp"
+#include "__ranges.hpp"  // IWYU pragma: keep
 
 #include "__prologue.hpp"
 
@@ -27,8 +28,8 @@ namespace STDEXEC
   inline constexpr __execute_may_block_caller_t const & execute_may_block_caller =
     __execute_may_block_caller;
 
-  using empty_env [[deprecated(
-    "STDEXEC::empty_env is now spelled " STDEXEC_PP_STRINGIZE(STDEXEC) "::env<>")]] = env<>;
+  using empty_env
+    [[deprecated("empty_env is now spelled " STDEXEC_PP_STRINGIZE(STDEXEC) "::env<>")]] = env<>;
 
   using dependent_completions [[deprecated("use dependent_sender_error instead of "
                                            "dependent_completions")]] = dependent_sender_error;
@@ -86,6 +87,9 @@ namespace STDEXEC
 
   [[deprecated]]
   inline constexpr exec::__execute_t const & execute = exec::__execute;
+
+  namespace [[deprecated("Use std::ranges directly")]] ranges
+  {}
 }  // namespace STDEXEC
 
 #include "__epilogue.hpp"

include/stdexec/__detail/__ranges.hpp

@@ -21,15 +21,18 @@
 
 #include "__prologue.hpp"
 
-namespace STDEXEC::ranges
+namespace STDEXEC
 {
-  using std::ranges::begin;
-  using std::ranges::end;
+  namespace [[deprecated("use std::ranges directly")]] ranges
+  {
+    using std::ranges::begin;
+    using std::ranges::end;
 
-  using std::ranges::range_value_t;
-  using std::ranges::range_reference_t;
-  using std::ranges::iterator_t;
-  using std::ranges::sentinel_t;
-}  // namespace STDEXEC::ranges
+    using std::ranges::range_value_t;
+    using std::ranges::range_reference_t;
+    using std::ranges::iterator_t;
+    using std::ranges::sentinel_t;
+  }  // namespace ranges
+}  // namespace STDEXEC
 
 #include "__epilogue.hpp"