makeUnorderedAsyncGeneratorFromAwaitableTryRange -> makeUnorderedTryAsyncGenerator

Summary: For consistency with the non-Try version

Reviewed By: Mizuchi

Differential Revision: D29961440

fbshipit-source-id: cf33d4779c6a889d2c6c42fa1ad6206b86d94088

folly/experimental/coro/Collect-inl.h

@@ -1016,8 +1016,7 @@ auto makeUnorderedAsyncGenerator(AsyncScope& scope, InputRange awaitables)
 }
 
 template <typename InputRange>
-auto makeUnorderedAsyncGeneratorFromAwaitableTryRange(
-    AsyncScope& scope, InputRange awaitables)
+auto makeUnorderedTryAsyncGenerator(AsyncScope& scope, InputRange awaitables)
     -> AsyncGenerator<detail::async_generator_from_awaitable_range_item_t<
         InputRange,
         true>&&> {
@@ -1036,7 +1035,7 @@ auto makeUnorderedAsyncGenerator(
 }
 
 template <typename InputRange>
-auto makeUnorderedAsyncGeneratorFromAwaitableTryRange(
+auto makeUnorderedTryAsyncGenerator(
     CancellableAsyncScope& scope, InputRange awaitables)
     -> AsyncGenerator<detail::async_generator_from_awaitable_range_item_t<
         InputRange,

folly/experimental/coro/Collect.h

@@ -244,7 +244,7 @@ using async_generator_from_awaitable_range_item_t = conditional_t<
 ////////////////////////////////////////////////////////////////////////////
 // makeUnorderedAsyncGenerator(AsyncScope&,
 // RangeOf<SemiAwaitable<T>>&&) -> AsyncGenerator<T&&>
-// makeUnorderedAsyncGeneratorFromAwaitableTryRange(AsyncScope&,
+// makeUnorderedTryAsyncGenerator(AsyncScope&,
 // RangeOf<SemiAwaitable<T>>&&) -> AsyncGenerator<Try<T>&&>
 
 // Returns an AsyncGenerator that yields results of passed-in awaitables in
@@ -254,7 +254,7 @@ using async_generator_from_awaitable_range_item_t = conditional_t<
 // makeUnorderedAsyncGenerator cancels all remaining
 // awaitables when any of them fail with an exception. Any results obtained
 // before the failure are still returned via the generator, then the first
-// exception in time. makeUnorderedAsyncGeneratorFromAwaitableTryRange does not
+// exception in time. makeUnorderedTryAsyncGenerator does not
 // cancel awaitables when one fails, and yields all results even when cancelled.
 //
 // Awaitables are attached to the passed-in AsyncScope.
@@ -265,8 +265,7 @@ auto makeUnorderedAsyncGenerator(AsyncScope& scope, InputRange awaitables)
         InputRange,
         false>&&>;
 template <typename InputRange>
-auto makeUnorderedAsyncGeneratorFromAwaitableTryRange(
-    AsyncScope& scope, InputRange awaitables)
+auto makeUnorderedTryAsyncGenerator(AsyncScope& scope, InputRange awaitables)
     -> AsyncGenerator<detail::async_generator_from_awaitable_range_item_t<
         InputRange,
         true>&&>;
@@ -280,11 +279,11 @@ auto makeUnorderedAsyncGenerator(
       scope, awaitables | ranges::views::move);
 }
 template <typename SemiAwaitable>
-auto makeUnorderedAsyncGeneratorFromAwaitableTryRange(
+auto makeUnorderedTryAsyncGenerator(
     AsyncScope& scope, std::vector<SemiAwaitable> awaitables)
-    -> decltype(makeUnorderedAsyncGeneratorFromAwaitableTryRange(
+    -> decltype(makeUnorderedTryAsyncGenerator(
         scope, awaitables | ranges::views::move)) {
-  co_return co_await makeUnorderedAsyncGeneratorFromAwaitableTryRange(
+  co_return co_await makeUnorderedTryAsyncGenerator(
       scope, awaitables | ranges::views::move);
 }
 
@@ -297,7 +296,7 @@ auto makeUnorderedAsyncGenerator(
         InputRange,
         false>&&>;
 template <typename InputRange>
-auto makeUnorderedAsyncGeneratorFromAwaitableTryRange(
+auto makeUnorderedTryAsyncGenerator(
     CancellableAsyncScope& scope, InputRange awaitables)
     -> AsyncGenerator<detail::async_generator_from_awaitable_range_item_t<
         InputRange,
@@ -312,11 +311,11 @@ auto makeUnorderedAsyncGenerator(
       scope, awaitables | ranges::views::move);
 }
 template <typename SemiAwaitable>
-auto makeUnorderedAsyncGeneratorFromAwaitableTryRange(
+auto makeUnorderedTryAsyncGenerator(
     CancellableAsyncScope& scope, std::vector<SemiAwaitable> awaitables)
-    -> decltype(makeUnorderedAsyncGeneratorFromAwaitableTryRange(
+    -> decltype(makeUnorderedTryAsyncGenerator(
         scope, awaitables | ranges::views::move)) {
-  co_return co_await makeUnorderedAsyncGeneratorFromAwaitableTryRange(
+  co_return co_await makeUnorderedTryAsyncGenerator(
       scope, awaitables | ranges::views::move);
 }
 

folly/experimental/coro/test/CollectTest.cpp

@@ -1152,8 +1152,7 @@ TEST_F(CollectAllTryRangeTest, GeneratorFromRange) {
     };
 
     auto results =
-        folly::coro::makeUnorderedAsyncGeneratorFromAwaitableTryRange(
-            scope, generateTasks());
+        folly::coro::makeUnorderedTryAsyncGenerator(scope, generateTasks());
     // co_await doesn't work inside EXPECT_EQ
     EXPECT_TRUE(**(co_await results.next()) == 1);
     EXPECT_TRUE(**(co_await results.next()) == 2);
@@ -1183,8 +1182,7 @@ TEST_F(CollectAllTryRangeTest, GeneratorFromRangeFailed) {
     };
 
     auto results =
-        folly::coro::makeUnorderedAsyncGeneratorFromAwaitableTryRange(
-            scope, generateTasks());
+        folly::coro::makeUnorderedTryAsyncGenerator(scope, generateTasks());
     // co_await doesn't work inside EXPECT_EQ
     EXPECT_TRUE(**(co_await results.next()) == 1);
     EXPECT_TRUE(**(co_await results.next()) == 2);
@@ -1215,8 +1213,7 @@ TEST_F(CollectAllTryRangeTest, GeneratorFromRangeCancelled) {
     };
     auto start = std::chrono::steady_clock::now();
     auto results =
-        folly::coro::makeUnorderedAsyncGeneratorFromAwaitableTryRange(
-            scope, generateTasks());
+        folly::coro::makeUnorderedTryAsyncGenerator(scope, generateTasks());
     auto result = co_await folly::coro::co_withCancellation(
         cancelSource.getToken(), results.next());
     auto end = std::chrono::steady_clock::now();