Remove deprecated stuff (#542)

This builds on PRs #538 and #539 to remove the concept of "untyped" _Senders_ and thus stop calling any _Senders_ "typed" (they're all typed). - #539 made `typed_sender<S>` an alias for `sender<S>` so now I can replace all uses of `typed_sender<>` with `sender<>` and deprecate `typed_sender<>`. - In the same spirit as #539, there's no need to refer to bulk _Senders_ as "typed" so I've renamed `typed_bulk_sender<>` to `bulk_sender<>` and deprecated `typed_bulk_sender<>`. - There's no need to call it `typed_via()` so `via()` now means what `typed_via()` meant and we retain `typed_via()` as a deprecated alias for `via()`. - Similarly for `typed_via_stream()`, `via_stream()` now means what `typed_via_stream()` meant and we retain `typed_via_stream()` as a deprecated alias for `via_stream()`. - I'm also deleting three things from `sender_concepts.hpp` that have been deprecated for a long time.
facebookexperimental · Jul 3, 2023 · 4dfd3a2 · 4dfd3a2
1 parent 5668f26
commit 4dfd3a2
Show file tree

Hide file tree

Showing 36 changed files with 220 additions and 181 deletions.
diff --git a/doc/api_reference.md b/doc/api_reference.md
@@ -173,7 +173,7 @@ using callback_t = void(void* /*context*/, int /*result*/);
 void old_c_style_api(int a, int b, void* context, callback_t* callback_fn);
 
 // A sender-based async API implemented in terms of the C-style API (using C++20):
-unifex::typed_sender auto new_sender_api(int a, int b) {
+unifex::sender auto new_sender_api(int a, int b) {
   return unifex::create<int>([=](auto& rec) {
     old_c_style_api(a, b, &rec, [](void* context, int result) {
       unifex::void_cast<decltype(rec)>(context).set_value(result);
@@ -701,7 +701,7 @@ value channel as an empty `std::optional`. The value channel is also converted
 into an optional. The result is a sender that never completes with done,
 reporting cancellation by completing with an empty optional.
 
-This function only accepts `typed_sender`s that complete with either
+This function only accepts `sender`s that complete with either
 `void` or a single type.
 
 For example:
@@ -1172,7 +1172,7 @@ auto&& [state...] =
 
 **Arguments:**
 The first argument to `at_coroutine_exit` is a callable that returns an awaitable type
-(e.g., a `unifex::task<>` or a type that satisfies the `typed_sender` concept).
+(e.g., a `unifex::task<>` or a type that satisfies the `sender` concept).
 
 The other arguments are optional state that may be needed by the cleanup action. The
 cleanup action assumes ownership of the passed-in state by copying the state into separate

diff --git a/examples/coroutine_stream_consumer.cpp b/examples/coroutine_stream_consumer.cpp
@@ -26,7 +26,7 @@
 #include <unifex/take_until.hpp>
 #include <unifex/task.hpp>
 #include <unifex/timed_single_thread_context.hpp>
-#include <unifex/typed_via_stream.hpp>
+#include <unifex/via_stream.hpp>
 #include <unifex/let_done.hpp>
 #include <unifex/then.hpp>
 #include <unifex/just.hpp>

diff --git a/examples/delayed_stream_cancellation.cpp b/examples/delayed_stream_cancellation.cpp
@@ -19,7 +19,7 @@
 #include <unifex/range_stream.hpp>
 #include <unifex/sync_wait.hpp>
 #include <unifex/timed_single_thread_context.hpp>
-#include <unifex/typed_via_stream.hpp>
+#include <unifex/via_stream.hpp>
 #include <unifex/scheduler_concepts.hpp>
 #include <unifex/then.hpp>
 #include <unifex/stop_when.hpp>

diff --git a/examples/for_each_via_thread_scheduler.cpp b/examples/for_each_via_thread_scheduler.cpp
@@ -19,7 +19,7 @@
 #include <unifex/sync_wait.hpp>
 #include <unifex/then.hpp>
 #include <unifex/transform_stream.hpp>
-#include <unifex/typed_via_stream.hpp>
+#include <unifex/via_stream.hpp>
 
 #include <cstdio>
 
@@ -30,7 +30,7 @@ int main() {
 
   sync_wait(then(
       for_each(
-          typed_via_stream(
+          via_stream(
               context.get_scheduler(),
               transform_stream(
                   range_stream{0, 10},

diff --git a/examples/for_each_via_trampoline.cpp b/examples/for_each_via_trampoline.cpp
@@ -19,7 +19,7 @@
 #include <unifex/trampoline_scheduler.hpp>
 #include <unifex/then.hpp>
 #include <unifex/transform_stream.hpp>
-#include <unifex/typed_via_stream.hpp>
+#include <unifex/via_stream.hpp>
 
 #include <cstdio>
 
@@ -28,7 +28,7 @@ using namespace unifex;
 int main() {
   sync_wait(then(
       for_each(
-          typed_via_stream(
+          via_stream(
               trampoline_scheduler{},
               transform_stream(
                   range_stream{0, 10},

diff --git a/examples/fp_delegation.cpp b/examples/fp_delegation.cpp
@@ -21,7 +21,7 @@
 #include <unifex/sync_wait.hpp>
 #include <unifex/timed_single_thread_context.hpp>
 #include <unifex/transform_stream.hpp>
-#include <unifex/typed_via_stream.hpp>
+#include <unifex/via_stream.hpp>
 #include <unifex/with_query_value.hpp>
 
 #include <atomic>
@@ -191,10 +191,10 @@ int main() {
   sync_wait(
       then(
           for_each(
-              typed_via_stream(
+              via_stream(
                   outer_delegating_ctx.get_scheduler(),
                   transform_stream(
-                      typed_via_stream(
+                      via_stream(
                           inner_delegating_ctx.get_scheduler(),
                           transform_stream(
                               range_stream{0, 10},

diff --git a/examples/get_scheduler.cpp b/examples/get_scheduler.cpp
@@ -20,7 +20,7 @@
 #include <unifex/sync_wait.hpp>
 #include <unifex/timed_single_thread_context.hpp>
 #include <unifex/transform_stream.hpp>
-#include <unifex/typed_via_stream.hpp>
+#include <unifex/via_stream.hpp>
 #include <unifex/with_query_value.hpp>
 
 #include <chrono>
@@ -45,7 +45,7 @@ int main() {
   // composed operations.
   sync_wait(with_query_value(
       then(
-          for_each(typed_via_stream(current_scheduler,
+          for_each(via_stream(current_scheduler,
                               transform_stream(range_stream{0, 10},
                                                [](int value) {
                                                  return value * value;

diff --git a/examples/linux/io_epoll_test.cpp b/examples/linux/io_epoll_test.cpp
@@ -34,7 +34,7 @@
 #include <unifex/then.hpp>
 #include <unifex/when_all.hpp>
 #include <unifex/repeat_effect_until.hpp>
-#include <unifex/typed_via.hpp>
+#include <unifex/via.hpp>
 #include <unifex/with_query_value.hpp>
 #include <unifex/let_done.hpp>
 #include <unifex/stop_when.hpp>
@@ -113,7 +113,7 @@ int main() {
               ++reps;
             });
       })
-        | typed_via(scheduler)
+        | via(scheduler)
           // Repeat the reads:
         | repeat_effect()
           // stop reads after requested time
@@ -129,7 +129,7 @@ int main() {
       sequence(
         just_from([&]{ printf("writes starting!\n"); }),
         defer([&, databuffer] { return discard(async_write_some(wPipeRef, databuffer)); })
-          | typed_via(scheduler)
+          | via(scheduler)
           | repeat_effect()
           | let_done([]{return just();})
           | with_query_value(get_stop_token, stopToken),

diff --git a/examples/produce_on_consume_via.cpp b/examples/produce_on_consume_via.cpp
@@ -20,7 +20,7 @@
 #include <unifex/sync_wait.hpp>
 #include <unifex/then.hpp>
 #include <unifex/transform_stream.hpp>
-#include <unifex/typed_via_stream.hpp>
+#include <unifex/via_stream.hpp>
 
 #include <cstdio>
 
@@ -32,7 +32,7 @@ int main() {
 
   sync_wait(then(
       for_each(
-          typed_via_stream(
+          via_stream(
               context1.get_scheduler(),
               on_stream(
                   context2.get_scheduler(),

diff --git a/examples/reduce_with_trampoline.cpp b/examples/reduce_with_trampoline.cpp
@@ -19,7 +19,7 @@
 #include <unifex/trampoline_scheduler.hpp>
 #include <unifex/then.hpp>
 #include <unifex/transform_stream.hpp>
-#include <unifex/typed_via_stream.hpp>
+#include <unifex/via_stream.hpp>
 
 #include <cstdio>
 
@@ -31,7 +31,7 @@ using namespace unifex;
 int main() {
   sync_wait(then(
       reduce_stream(
-          typed_via_stream(
+          via_stream(
               trampoline_scheduler{},
               transform_stream(
                   range_stream{0, 100'000},

diff --git a/examples/stop_immediately.cpp b/examples/stop_immediately.cpp
@@ -20,7 +20,7 @@
 #include <unifex/stop_immediately.hpp>
 #include <unifex/take_until.hpp>
 #include <unifex/thread_unsafe_event_loop.hpp>
-#include <unifex/typed_via_stream.hpp>
+#include <unifex/via_stream.hpp>
 
 #include <chrono>
 #include <cstdio>

diff --git a/examples/type_erased_stream.cpp b/examples/type_erased_stream.cpp
@@ -21,7 +21,7 @@
 #include <unifex/sync_wait.hpp>
 #include <unifex/then.hpp>
 #include <unifex/transform_stream.hpp>
-#include <unifex/typed_via_stream.hpp>
+#include <unifex/via_stream.hpp>
 
 #include <cstdio>
 
@@ -34,7 +34,7 @@ int main() {
   sync_wait(then(
       for_each(
             type_erase<int>(
-                typed_via_stream(
+                via_stream(
                     context1.get_scheduler(),
                     on_stream(
                         context2.get_scheduler(),

diff --git a/include/unifex/bulk_join.hpp b/include/unifex/bulk_join.hpp
@@ -138,7 +138,7 @@ class _join_sender<Source>::type {
 struct _fn {
     template(typename Source)
         (requires
-            typed_bulk_sender<Source> &&
+            bulk_sender<Source> &&
             tag_invocable<_fn, Source>)
     auto operator()(Source&& source) const
         noexcept(is_nothrow_tag_invocable_v<_fn, Source>)
@@ -148,7 +148,7 @@ struct _fn {
 
     template(typename Source)
         (requires
-            typed_bulk_sender<Source> &&
+            bulk_sender<Source> &&
             (!tag_invocable<_fn, Source>))
     auto operator()(Source&& source) const
         noexcept(std::is_nothrow_constructible_v<remove_cvref_t<Source>, Source>)

diff --git a/include/unifex/bulk_transform.hpp b/include/unifex/bulk_transform.hpp
@@ -206,7 +206,7 @@ class _tfx_sender<Source, Func, Policy>::type {
 
 struct _fn {
     template(typename Source, typename Func, typename FuncPolicy = decltype(get_execution_policy(UNIFEX_DECLVAL(Func&))))
-        (requires typed_bulk_sender<Source>)
+        (requires bulk_sender<Source>)
     auto operator()(Source&& s, Func&& f) const
         noexcept(is_nothrow_callable_v<_fn, Source, Func, FuncPolicy>)
         -> callable_result_t<_fn, Source, Func, FuncPolicy> {
@@ -215,7 +215,7 @@ struct _fn {
 
     template(typename Source, typename Func, typename FuncPolicy)
         (requires
-            typed_bulk_sender<Source> AND
+            bulk_sender<Source> AND
             tag_invocable<_fn, Source, Func, FuncPolicy>)
     auto operator()(Source&& s, Func&& f, FuncPolicy policy) const
         noexcept(is_nothrow_tag_invocable_v<_fn, Source, Func, FuncPolicy>)
@@ -225,7 +225,7 @@ struct _fn {
 
     template(typename Source, typename Func, typename FuncPolicy)
         (requires
-            typed_bulk_sender<Source> AND
+            bulk_sender<Source> AND
             (!tag_invocable<_fn, Source, Func, FuncPolicy>))
     auto operator()(Source&& s, Func&& f, FuncPolicy policy) const
         noexcept(

diff --git a/include/unifex/create.hpp b/include/unifex/create.hpp
@@ -172,7 +172,7 @@ struct _fn {
  *  void old_c_style_api(int a, int b, void* context, callback_t* callback_fn);
  *
  *  // A sender-based async API implemented in terms of the C-style API (using C++20):
- *  unifex::typed_sender auto new_sender_api(int a, int b) {
+ *  unifex::sender auto new_sender_api(int a, int b) {
  *    return unifex::create<int>([=](auto& rec) {
  *      old_c_style_api(a, b, &rec, [](void* context, int result) {
  *        unifex::void_cast<decltype(rec)>(context).set_value(result);

diff --git a/include/unifex/done_as_optional.hpp b/include/unifex/done_as_optional.hpp
@@ -32,7 +32,7 @@ namespace _done_as_opt {
 namespace _cpo {
 inline const struct _fn {
   template(typename Sender) //
-    (requires _single_typed_sender<Sender>) //
+    (requires _single_sender<Sender>) //
   auto operator()(Sender&& predecessor) const {
     using optional_t = std::optional<
         non_void_t<std::decay_t<sender_single_value_return_type_t<Sender>>>>;

diff --git a/include/unifex/nest.hpp b/include/unifex/nest.hpp
@@ -40,8 +40,8 @@ inline const struct _nest_fn final {
 
 public:
   template(typename Sender, typename Scope)  //
-      (requires typed_sender<Sender> AND tag_invocable<_nest_fn, Sender, Scope&>
-           AND typed_sender<tag_invoke_result_t<_nest_fn, Sender, Scope&>>)  //
+      (requires sender<Sender> AND tag_invocable<_nest_fn, Sender, Scope&>
+           AND sender<tag_invoke_result_t<_nest_fn, Sender, Scope&>>)  //
       auto
       operator()(Sender&& sender, Scope& scope) const
       noexcept(is_nothrow_tag_invocable_v<_nest_fn, Sender, Scope&>)
@@ -50,9 +50,9 @@ inline const struct _nest_fn final {
   }
 
   template(typename Sender, typename Scope)  //
-      (requires typed_sender<Sender> AND(
+      (requires sender<Sender> AND(
           !tag_invocable<_nest_fn, Sender, Scope&>)
-           AND typed_sender<nest_member_result_t<Scope, Sender>>)  //
+           AND sender<nest_member_result_t<Scope, Sender>>)  //
       auto
       operator()(Sender&& sender, Scope& scope) const
       noexcept(is_nest_member_nothrow_v<Scope, Sender>)