Merge remote-tracking branch 'origin/main' into seq-iterate-forward-range

Author: ericniebler

.clang-format

@@ -71,6 +71,9 @@ EmptyLineAfterAccessModifier: Never
 EmptyLineBeforeAccessModifier: Leave
 ExperimentalAutoDetectBinPacking: true
 FixNamespaceComments: true
+IfMacros: [
+  STDEXEC_CATCH'
+]
 IncludeBlocks: Preserve
 IndentAccessModifiers: false
 IndentCaseBlocks: false
@@ -90,7 +93,7 @@ Macros: [
   'STDEXEC_IMMOVABLE_NO_UNIQUE_ADDRESS=[[no_unique_address]]',
   'STDEXEC_MISSING_MEMBER(X,Y)=true',
   'STDEXEC_DEFINE_MEMBER(X)=void foo() {}',
-  'STDEXEC_AUTO_RETURN(...)=->decltype(auto){ return __VA_ARGS__; }'
+  'STDEXEC_AUTO_RETURN(...)=->decltype(auto){ return __VA_ARGS__; }',
 ]
 MaxEmptyLinesToKeep: 2
 NamespaceIndentation: All
@@ -149,6 +152,10 @@ SpacesInConditionalStatement: false
 SpacesInContainerLiterals: true
 SpacesInParentheses: false
 Standard: c++20
+StatementMacros: [
+  'STDEXEC_IF_HOST',
+  'STDEXEC_IF_DEVICE',
+]
 TabWidth: 0
 TypenameMacros: []
 UseTab: Never

CMakeLists.txt

@@ -67,8 +67,10 @@ message(STATUS "Build date       : ${STDEXEC_BUILD_DATE}")
 message(STATUS "Build year       : ${STDEXEC_BUILD_YEAR}")
 message(STATUS)
 
-# Integrate with LLVM/clang tooling
-include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/clangd_compile_info.cmake)
+if (STDEXEC_IS_TOP_LEVEL)
+  # Integrate with LLVM/clang tooling
+  include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/clangd_compile_info.cmake)
+endif()
 
 # Write the version header
 rapids_cmake_write_version_file(include/stdexec_version_config.hpp)

examples/algorithms/retry.hpp

@@ -91,10 +91,11 @@ struct _op {
   }
 
   void _retry() noexcept {
-    try {
+    STDEXEC_TRY {
       o_.emplace(_connect()); // potentially throwing
       stdexec::start(*o_);
-    } catch (...) {
+    }
+    STDEXEC_CATCH_ALL {
       stdexec::set_error(static_cast<R&&>(r_), std::current_exception());
     }
   }

examples/algorithms/then.hpp

@@ -41,10 +41,11 @@ class _then_receiver : public stdexec::receiver_adaptor<_then_receiver<R, F>, R>
   template <class... As>
     requires stdexec::receiver_of<R, _completions<As...>>
   void set_value(As&&... as) && noexcept {
-    try {
+    STDEXEC_TRY {
       stdexec::set_value(
         std::move(*this).base(), std::invoke(static_cast<F&&>(f_), static_cast<As&&>(as)...));
-    } catch (...) {
+    }
+    STDEXEC_CATCH_ALL {
       stdexec::set_error(std::move(*this).base(), std::current_exception());
     }
   }

examples/benchmark/static_thread_pool_old.hpp

@@ -274,14 +274,15 @@ namespace exec_old {
 
     threads_.reserve(threadCount);
 
-    try {
+    STDEXEC_TRY {
       for (std::uint32_t i = 0; i < threadCount; ++i) {
         threads_.emplace_back([this, i] { run(i); });
       }
-    } catch (...) {
+    }
+    STDEXEC_CATCH_ALL {
       request_stop();
       join();
-      throw;
+      STDEXEC_THROW();
     }
   }
 

examples/hello_coro.cpp

@@ -41,11 +41,12 @@ auto async_stop_token() -> exec::task<std::optional<stdexec::inplace_stop_token>
 }
 
 auto main() -> int {
-  try {
+  STDEXEC_TRY {
     // Awaitables are implicitly senders:
     auto [i] = stdexec::sync_wait(async_answer2(just(42), just())).value();
     std::cout << "The answer is " << i.value() << '\n';
-  } catch (std::exception& e) {
+  }
+  STDEXEC_CATCH(const std::exception& e) {
     std::cout << e.what() << '\n';
   }
 }

examples/server_theme/let_value.cpp

@@ -52,6 +52,7 @@
 // Use a thread pool
 #include "exec/static_thread_pool.hpp"
 
+#if !STDEXEC_STD_NO_EXCEPTIONS()
 namespace ex = stdexec;
 
 struct http_request {
@@ -151,3 +152,11 @@ auto main() -> int {
 
   return 0;
 }
+
+#else
+
+int main() {
+  std::cout << "This example requires C++ exceptions to be enabled.\n";
+  return 0;
+}
+#endif // !STDEXEC_STD_NO_EXCEPTIONS()

include/asioexec/completion_token.hpp

@@ -194,9 +194,10 @@ namespace asioexec {
       template <typename F>
       void run_(F&& f) noexcept {
         const frame_ frame(*this);
-        try {
+        STDEXEC_TRY {
           static_cast<F&&>(f)();
-        } catch (...) {
+        }
+        STDEXEC_CATCH_ALL {
           STDEXEC_ASSERT(frame);
           //  Do not overwrite the first exception encountered
           if (!ex_) {
@@ -255,10 +256,11 @@ namespace asioexec {
         if (self_->ex_) {
           ::stdexec::set_error(static_cast<Receiver&&>(self_->r_), std::move(self_->ex_));
         } else {
-          try {
+          STDEXEC_TRY {
             completion_token::set_value<Signatures>(
               static_cast<Receiver&&>(self_->r_), static_cast<Args&&>(args)...);
-          } catch (...) {
+          }
+          STDEXEC_CATCH_ALL {
             ::stdexec::set_error(static_cast<Receiver&&>(self_->r_), std::current_exception());
           }
         }
@@ -299,7 +301,7 @@ namespace asioexec {
 
       void start() & noexcept {
         const typename base_::frame_ frame(*this);
-        try {
+        STDEXEC_TRY {
           std::apply(
             [&](auto&&... args) {
               std::invoke(
@@ -308,7 +310,8 @@ namespace asioexec {
                 static_cast<decltype(args)&&>(args)...);
             },
             std::move(args_));
-        } catch (...) {
+        }
+        STDEXEC_CATCH_ALL {
           if (!base_::ex_) {
             base_::ex_ = std::current_exception();
           }

include/asioexec/use_sender.hpp

@@ -39,9 +39,10 @@ namespace asioexec {
     std::exception_ptr to_exception_ptr(T t) noexcept {
       using exception_type =
         std::conditional_t<std::is_same_v<T, std::error_code>, std::system_error, system_error>;
-      try {
+      STDEXEC_TRY {
         return std::make_exception_ptr(exception_type(static_cast<T&&>(t)));
-      } catch (...) {
+      }
+      STDEXEC_CATCH_ALL {
         return std::current_exception();
       }
     }

include/exec/__detail/__system_context_default_impl.hpp

@@ -238,12 +238,13 @@ namespace exec::__system_context_default_impl {
 
    public:
     void schedule(std::span<std::byte> __storage, receiver& __r) noexcept override {
-      try {
+      STDEXEC_TRY {
         auto __sndr = stdexec::schedule(__pool_scheduler_);
         auto __os =
           __schedule_operation_t::__construct_maybe_alloc(__storage, &__r, std::move(__sndr));
         __os->start();
-      } catch (std::exception& __e) {
+      }
+      STDEXEC_CATCH(std::exception & __e) {
         __r.set_error(std::current_exception());
       }
     }
@@ -252,7 +253,7 @@ namespace exec::__system_context_default_impl {
       uint32_t __size,
       std::span<std::byte> __storage,
       bulk_item_receiver& __r) noexcept override {
-      try {
+      STDEXEC_TRY {
         // Determine the chunking size based on the ratio between the given size and the number of workers in our pool.
         // Aim at having 2 chunks per worker.
         uint32_t __chunk_size = (__available_parallelism_ > 0
@@ -271,7 +272,8 @@ namespace exec::__system_context_default_impl {
         auto __os = __schedule_bulk_chunked_operation_t::__construct_maybe_alloc(
           __storage, &__r, std::move(__sndr));
         __os->start();
-      } catch (std::exception& __e) {
+      }
+      STDEXEC_CATCH(std::exception & __e) {
         __r.set_error(std::current_exception());
       }
     }
@@ -280,7 +282,7 @@ namespace exec::__system_context_default_impl {
       uint32_t __size,
       std::span<std::byte> __storage,
       bulk_item_receiver& __r) noexcept override {
-      try {
+      STDEXEC_TRY {
         auto __sndr = stdexec::bulk(
           stdexec::schedule(__pool_scheduler_),
           stdexec::par,
@@ -289,7 +291,8 @@ namespace exec::__system_context_default_impl {
         auto __os = __schedule_bulk_unchunked_operation_t::__construct_maybe_alloc(
           __storage, &__r, std::move(__sndr));
         __os->start();
-      } catch (std::exception& __e) {
+      }
+      STDEXEC_CATCH(std::exception & __e) {
         __r.set_error(std::current_exception());
       }
     }