Remove unnecessary typename before dependent names (#1660)

Author: localspook

examples/benchmark/fibonacci.cpp

@@ -29,7 +29,7 @@ auto serial_fib(long n) -> long {
 
 template <class... Ts>
 using any_sender_of =
-  typename exec::any_receiver_ref<stdexec::completion_signatures<Ts...>>::template any_sender<>;
+  exec::any_receiver_ref<stdexec::completion_signatures<Ts...>>::template any_sender<>;
 
 using fib_sender = any_sender_of<stdexec::set_value_t(long)>;
 

examples/nvexec/maxwell/snr.cuh

@@ -61,14 +61,14 @@ namespace ex = stdexec;
 namespace nvexec::_strm::repeat_n {
   template <class OpT>
   class receiver_2_t : public stream_receiver_base {
-    using Sender = typename OpT::PredSender;
-    using Receiver = typename OpT::Receiver;
+    using Sender = OpT::PredSender;
+    using Receiver = OpT::Receiver;
 
     OpT& op_state_;
 
    public:
     void set_value() noexcept {
-      using inner_op_state_t = typename OpT::inner_op_state_t;
+      using inner_op_state_t = OpT::inner_op_state_t;
 
       op_state_.i_++;
 
@@ -95,7 +95,7 @@ namespace nvexec::_strm::repeat_n {
       op_state_.propagate_completion_signal(set_stopped_t());
     }
 
-    auto get_env() const noexcept -> typename OpT::env_t {
+    auto get_env() const noexcept -> OpT::env_t {
       return op_state_.make_env();
     }
 
@@ -106,13 +106,13 @@ namespace nvexec::_strm::repeat_n {
 
   template <class OpT>
   class receiver_1_t : public stream_receiver_base {
-    using Receiver = typename OpT::Receiver;
+    using Receiver = OpT::Receiver;
 
     OpT& op_state_;
 
    public:
     void set_value() noexcept {
-      using inner_op_state_t = typename OpT::inner_op_state_t;
+      using inner_op_state_t = OpT::inner_op_state_t;
 
       if (op_state_.n_) {
         auto sch = ex::get_scheduler(ex::get_env(op_state_.rcvr_));
@@ -137,7 +137,7 @@ namespace nvexec::_strm::repeat_n {
       op_state_.propagate_completion_signal(set_stopped_t());
     }
 
-    auto get_env() const noexcept -> typename OpT::env_t {
+    auto get_env() const noexcept -> OpT::env_t {
       return op_state_.make_env();
     }
 
@@ -196,16 +196,16 @@ namespace repeat_n_detail {
 
   template <class OpT>
   class receiver_2_t {
-    using Sender = typename OpT::PredSender;
-    using Receiver = typename OpT::Receiver;
+    using Sender = OpT::PredSender;
+    using Receiver = OpT::Receiver;
 
     OpT& op_state_;
 
    public:
     using receiver_concept = ex::receiver_t;
 
     void set_value() noexcept {
-      using inner_op_state_t = typename OpT::inner_op_state_t;
+      using inner_op_state_t = OpT::inner_op_state_t;
 
       op_state_.i_++;
 
@@ -244,15 +244,15 @@ namespace repeat_n_detail {
 
   template <class OpT>
   class receiver_1_t {
-    using Receiver = typename OpT::Receiver;
+    using Receiver = OpT::Receiver;
 
     OpT& op_state_;
 
    public:
     using receiver_concept = ex::receiver_t;
 
     void set_value() noexcept {
-      using inner_op_state_t = typename OpT::inner_op_state_t;
+      using inner_op_state_t = OpT::inner_op_state_t;
 
       if (op_state_.n_) {
         auto sch = ex::get_scheduler(ex::get_env(op_state_.rcvr_));

include/asioexec/as_default_on.hpp

@@ -27,9 +27,10 @@ namespace asioexec {
 
   template <typename CompletionToken, typename IoObject>
   using as_default_on_t =
-    typename std::remove_cvref_t<IoObject>::template rebind_executor<executor_with_default<
+    std::remove_cvref_t<IoObject>::template rebind_executor<executor_with_default<
       std::remove_cvref_t<decltype(std::declval<IoObject&>().get_executor())>,
-      CompletionToken>>::other;
+      CompletionToken
+    >>::other;
 
   namespace detail::as_default_on {
 

include/asioexec/use_sender.hpp

@@ -139,7 +139,7 @@ namespace asioexec {
     };
 
     template <typename... Args>
-    using transform_set_value_t = typename transform_set_value<Args...>::type;
+    using transform_set_value_t = transform_set_value<Args...>::type;
 
     template <typename Signatures>
     using completion_signatures = ::stdexec::transform_completion_signatures<

include/exec/__detail/__basic_sequence.hpp

@@ -37,7 +37,7 @@ namespace exec {
     using __t = __seqexpr;
     using __id = __seqexpr;
     using __desc_t = decltype(_DescriptorFn());
-    using __tag_t = typename __desc_t::__tag;
+    using __tag_t = __desc_t::__tag;
     using __captures_t =
       stdexec::__minvoke<__desc_t, stdexec::__q<stdexec::__detail::__captures_t>>;
 

include/exec/__detail/__bwos_lifo_queue.hpp

@@ -84,7 +84,7 @@ namespace exec::bwos {
 
    private:
     template <class Sp>
-    using allocator_of_t = typename std::allocator_traits<Allocator>::template rebind_alloc<Sp>;
+    using allocator_of_t = std::allocator_traits<Allocator>::template rebind_alloc<Sp>;
 
     struct block_type {
       explicit block_type(std::size_t block_size, Allocator allocator = Allocator());
@@ -319,8 +319,8 @@ namespace exec::bwos {
   }
 
   template <class Tp, class Allocator>
-  auto lifo_queue<Tp, Allocator>::block_type::operator=(const block_type &other) ->
-    typename lifo_queue<Tp, Allocator>::block_type & {
+  auto lifo_queue<Tp, Allocator>::block_type::operator=(const block_type &other)
+    -> lifo_queue<Tp, Allocator>::block_type & {
     head_.store(other.head_.load(std::memory_order_relaxed), std::memory_order_relaxed);
     tail_.store(other.tail_.load(std::memory_order_relaxed), std::memory_order_relaxed);
     steal_tail_.store(other.steal_tail_.load(std::memory_order_relaxed), std::memory_order_relaxed);
@@ -339,8 +339,8 @@ namespace exec::bwos {
   }
 
   template <class Tp, class Allocator>
-  auto lifo_queue<Tp, Allocator>::block_type::operator=(block_type &&other) noexcept ->
-    typename lifo_queue<Tp, Allocator>::block_type & {
+  auto lifo_queue<Tp, Allocator>::block_type::operator=(block_type &&other) noexcept
+    -> lifo_queue<Tp, Allocator>::block_type & {
     head_.store(other.head_.load(std::memory_order_relaxed), std::memory_order_relaxed);
     tail_.store(other.tail_.load(std::memory_order_relaxed), std::memory_order_relaxed);
     steal_tail_.store(other.steal_tail_.load(std::memory_order_relaxed), std::memory_order_relaxed);

include/exec/any_sender_of.hpp

@@ -333,7 +333,7 @@ namespace exec {
         void __construct_small(_As&&... __args) {
           static_assert(sizeof(_Tp) <= __buffer_size && alignof(_Tp) <= __alignment);
           _Tp* __pointer = reinterpret_cast<_Tp*>(&__buffer_[0]);
-          using _Alloc = typename std::allocator_traits<_Allocator>::template rebind_alloc<_Tp>;
+          using _Alloc = std::allocator_traits<_Allocator>::template rebind_alloc<_Tp>;
           _Alloc __alloc{__allocator_};
           std::allocator_traits<_Alloc>::construct(
             __alloc, __pointer, static_cast<_As&&>(__args)...);
@@ -342,7 +342,7 @@ namespace exec {
 
         template <class _Tp, class... _As>
         void __construct_large(_As&&... __args) {
-          using _Alloc = typename std::allocator_traits<_Allocator>::template rebind_alloc<_Tp>;
+          using _Alloc = std::allocator_traits<_Allocator>::template rebind_alloc<_Tp>;
           _Alloc __alloc{__allocator_};
           _Tp* __pointer = std::allocator_traits<_Alloc>::allocate(__alloc, 1);
           STDEXEC_TRY {
@@ -361,7 +361,7 @@ namespace exec {
           if (!__self.__object_pointer_) {
             return;
           }
-          using _Alloc = typename std::allocator_traits<_Allocator>::template rebind_alloc<_Tp>;
+          using _Alloc = std::allocator_traits<_Allocator>::template rebind_alloc<_Tp>;
           _Alloc __alloc{__self.__allocator_};
           _Tp* __pointer = static_cast<_Tp*>(std::exchange(__self.__object_pointer_, nullptr));
           std::allocator_traits<_Alloc>::destroy(__alloc, __pointer);
@@ -500,15 +500,15 @@ namespace exec {
       void __construct_small(_As&&... __args) {
         static_assert(sizeof(_Tp) <= __buffer_size && alignof(_Tp) <= __alignment);
         _Tp* __pointer = reinterpret_cast<_Tp*>(&__buffer_[0]);
-        using _Alloc = typename std::allocator_traits<_Allocator>::template rebind_alloc<_Tp>;
+        using _Alloc = std::allocator_traits<_Allocator>::template rebind_alloc<_Tp>;
         _Alloc __alloc{__allocator_};
         std::allocator_traits<_Alloc>::construct(__alloc, __pointer, static_cast<_As&&>(__args)...);
         __object_pointer_ = __pointer;
       }
 
       template <class _Tp, class... _As>
       void __construct_large(_As&&... __args) {
-        using _Alloc = typename std::allocator_traits<_Allocator>::template rebind_alloc<_Tp>;
+        using _Alloc = std::allocator_traits<_Allocator>::template rebind_alloc<_Tp>;
         _Alloc __alloc{__allocator_};
         _Tp* __pointer = std::allocator_traits<_Alloc>::allocate(__alloc, 1);
         STDEXEC_TRY {
@@ -527,7 +527,7 @@ namespace exec {
         if (!__self.__object_pointer_) {
           return;
         }
-        using _Alloc = typename std::allocator_traits<_Allocator>::template rebind_alloc<_Tp>;
+        using _Alloc = std::allocator_traits<_Allocator>::template rebind_alloc<_Tp>;
         _Alloc __alloc{__self.__allocator_};
         _Tp* __pointer = static_cast<_Tp*>(std::exchange(__self.__object_pointer_, nullptr));
         std::allocator_traits<_Alloc>::destroy(__alloc, __pointer);
@@ -546,7 +546,7 @@ namespace exec {
         if constexpr (__is_small<_Tp>) {
           _Tp& __other_object = *__pointer;
           __self.template __construct_small<_Tp>(static_cast<_Tp&&>(__other_object));
-          using _Alloc = typename std::allocator_traits<_Allocator>::template rebind_alloc<_Tp>;
+          using _Alloc = std::allocator_traits<_Allocator>::template rebind_alloc<_Tp>;
           _Alloc __alloc{__self.__allocator_};
           std::allocator_traits<_Alloc>::destroy(__alloc, __pointer);
         } else {
@@ -873,9 +873,8 @@ namespace exec {
     struct __operation_base {
       STDEXEC_ATTRIBUTE(no_unique_address) _Receiver __rcvr_;
       stdexec::inplace_stop_source __stop_source_{};
-      using __stop_callback = typename stdexec::stop_token_of_t<
-        stdexec::env_of_t<_Receiver>
-      >::template callback_type<__on_stop_t>;
+      using __stop_callback =
+        stdexec::stop_token_of_t<stdexec::env_of_t<_Receiver>>::template callback_type<__on_stop_t>;
       std::optional<__stop_callback> __on_stop_{};
     };
 
@@ -1250,9 +1249,9 @@ namespace exec {
       }
 
       template <stdexec::__decays_to<any_sender> _Self, class... _Env>
-      requires(__any::__satisfies_receiver_query<decltype(_ReceiverQueries), _Env ...> && ...)
-      static auto get_completion_signatures(_Self&&, _Env&&...) noexcept ->
-        typename __sender_base::completion_signatures {
+        requires(__any::__satisfies_receiver_query<decltype(_ReceiverQueries), _Env...> && ...)
+      static auto get_completion_signatures(_Self&&, _Env&&...) noexcept
+        -> __sender_base::completion_signatures {
         return {};
       }
 
@@ -1298,10 +1297,10 @@ namespace exec {
           stdexec::get_completion_scheduler<stdexec::set_value_t>.signature<any_scheduler() noexcept>;
         template <class... _Queries>
         using __schedule_sender_fn =
-          typename __schedule_receiver::template any_sender<__any_scheduler_noexcept_signature>;
+          __schedule_receiver::template any_sender<__any_scheduler_noexcept_signature>;
 #else
         template <class... _Queries>
-        using __schedule_sender_fn = typename __schedule_receiver::template any_sender<
+        using __schedule_sender_fn = __schedule_receiver::template any_sender<
           stdexec::get_completion_scheduler<stdexec::set_value_t>.template signature<any_scheduler() noexcept>
         >;
 #endif

include/exec/async_scope.hpp

@@ -311,7 +311,7 @@ namespace exec {
 
       class __t : __subscription {
         using __forward_consumer =
-          typename stop_token_of_t<env_of_t<_Receiver>>::template callback_type<__forward_stopped>;
+          stop_token_of_t<env_of_t<_Receiver>>::template callback_type<__forward_stopped>;
 
         void __complete_() noexcept {
           STDEXEC_TRY {

include/exec/fork_join.hpp

@@ -59,7 +59,7 @@ namespace exec {
     >;
 
     template <class Completions>
-    using _variant_t = typename stdexec::__mset_insert<
+    using _variant_t = stdexec::__mset_insert<
       stdexec::__for_each_completion_signature<
         Completions,
         stdexec::__decayed_tuple,

include/exec/just_from.hpp

@@ -153,7 +153,7 @@ namespace exec {
     };
 
     template <class Fn, class Tag = JustTag>
-    using _sndr = typename Tag::template _sndr<Fn>;
+    using _sndr = Tag::template _sndr<Fn>;
 
    public:
     template <class Fn>