Deshim coro in fbcode/folly

Summary: The following rules were deshimmed: ``` //folly/experimental/coro:accumulate -> //folly/coro:accumulate //folly/experimental/coro:async_generator -> //folly/coro:async_generator //folly/experimental/coro:async_pipe -> //folly/coro:async_pipe //folly/experimental/coro:async_scope -> //folly/coro:async_scope //folly/experimental/coro:async_stack -> //folly/coro:async_stack //folly/experimental/coro:baton -> //folly/coro:baton //folly/experimental/coro:blocking_wait -> //folly/coro:blocking_wait //folly/experimental/coro:collect -> //folly/coro:collect //folly/experimental/coro:concat -> //folly/coro:concat //folly/experimental/coro:coroutine -> //folly/coro:coroutine //folly/experimental/coro:current_executor -> //folly/coro:current_executor //folly/experimental/coro:detach_on_cancel -> //folly/coro:detach_on_cancel //folly/experimental/coro:detail_barrier -> //folly/coro:detail_barrier //folly/experimental/coro:detail_barrier_task -> //folly/coro:detail_barrier_task //folly/experimental/coro:detail_current_async_frame -> //folly/coro:detail_current_async_frame //folly/experimental/coro:detail_helpers -> //folly/coro:detail_helpers //folly/experimental/coro:detail_malloc -> //folly/coro:detail_malloc //folly/experimental/coro:detail_manual_lifetime -> //folly/coro:detail_manual_lifetime //folly/experimental/coro:detail_traits -> //folly/coro:detail_traits //folly/experimental/coro:filter -> //folly/coro:filter //folly/experimental/coro:future_util -> //folly/coro:future_util //folly/experimental/coro:generator -> //folly/coro:generator //folly/experimental/coro:gmock_helpers -> //folly/coro:gmock_helpers //folly/experimental/coro:gtest_helpers -> //folly/coro:gtest_helpers //folly/experimental/coro:inline_task -> //folly/coro:inline_task //folly/experimental/coro:invoke -> //folly/coro:invoke //folly/experimental/coro:merge -> //folly/coro:merge //folly/experimental/coro:mutex -> //folly/coro:mutex //folly/experimental/coro:promise -> //folly/coro:promise //folly/experimental/coro:result -> //folly/coro:result //folly/experimental/coro:retry -> //folly/coro:retry //folly/experimental/coro:rust_adaptors -> //folly/coro:rust_adaptors //folly/experimental/coro:scope_exit -> //folly/coro:scope_exit //folly/experimental/coro:shared_lock -> //folly/coro:shared_lock //folly/experimental/coro:shared_mutex -> //folly/coro:shared_mutex //folly/experimental/coro:sleep -> //folly/coro:sleep //folly/experimental/coro:small_unbounded_queue -> //folly/coro:small_unbounded_queue //folly/experimental/coro:task -> //folly/coro:task //folly/experimental/coro:timed_wait -> //folly/coro:timed_wait //folly/experimental/coro:timeout -> //folly/coro:timeout //folly/experimental/coro:traits -> //folly/coro:traits //folly/experimental/coro:transform -> //folly/coro:transform //folly/experimental/coro:unbounded_queue -> //folly/coro:unbounded_queue //folly/experimental/coro:via_if_async -> //folly/coro:via_if_async //folly/experimental/coro:with_async_stack -> //folly/coro:with_async_stack //folly/experimental/coro:with_cancellation -> //folly/coro:with_cancellation //folly/experimental/coro:bounded_queue -> //folly/coro:bounded_queue //folly/experimental/coro:shared_promise -> //folly/coro:shared_promise //folly/experimental/coro:cleanup -> //folly/coro:cleanup //folly/experimental/coro:auto_cleanup_fwd -> //folly/coro:auto_cleanup_fwd //folly/experimental/coro:auto_cleanup -> //folly/coro:auto_cleanup ``` The following headers were deshimmed: ``` folly/experimental/coro/Accumulate-inl.h -> folly/coro/Accumulate-inl.h folly/experimental/coro/Accumulate.h -> folly/coro/Accumulate.h folly/experimental/coro/AsyncGenerator.h -> folly/coro/AsyncGenerator.h folly/experimental/coro/AsyncPipe.h -> folly/coro/AsyncPipe.h folly/experimental/coro/AsyncScope.h -> folly/coro/AsyncScope.h folly/experimental/coro/AsyncStack.h -> folly/coro/AsyncStack.h folly/experimental/coro/Baton.h -> folly/coro/Baton.h folly/experimental/coro/BlockingWait.h -> folly/coro/BlockingWait.h folly/experimental/coro/Collect-inl.h -> folly/coro/Collect-inl.h folly/experimental/coro/Collect.h -> folly/coro/Collect.h folly/experimental/coro/Concat-inl.h -> folly/coro/Concat-inl.h folly/experimental/coro/Concat.h -> folly/coro/Concat.h folly/experimental/coro/Coroutine.h -> folly/coro/Coroutine.h folly/experimental/coro/CurrentExecutor.h -> folly/coro/CurrentExecutor.h folly/experimental/coro/DetachOnCancel.h -> folly/coro/DetachOnCancel.h folly/experimental/coro/detail/Barrier.h -> folly/coro/detail/Barrier.h folly/experimental/coro/detail/BarrierTask.h -> folly/coro/detail/BarrierTask.h folly/experimental/coro/detail/CurrentAsyncFrame.h -> folly/coro/detail/CurrentAsyncFrame.h folly/experimental/coro/detail/Helpers.h -> folly/coro/detail/Helpers.h folly/experimental/coro/detail/Malloc.h -> folly/coro/detail/Malloc.h folly/experimental/coro/detail/ManualLifetime.h -> folly/coro/detail/ManualLifetime.h folly/experimental/coro/detail/Traits.h -> folly/coro/detail/Traits.h folly/experimental/coro/Filter-inl.h -> folly/coro/Filter-inl.h folly/experimental/coro/Filter.h -> folly/coro/Filter.h folly/experimental/coro/FutureUtil.h -> folly/coro/FutureUtil.h folly/experimental/coro/Generator.h -> folly/coro/Generator.h folly/experimental/coro/GmockHelpers.h -> folly/coro/GmockHelpers.h folly/experimental/coro/GtestHelpers.h -> folly/coro/GtestHelpers.h folly/experimental/coro/detail/InlineTask.h -> folly/coro/detail/InlineTask.h folly/experimental/coro/Invoke.h -> folly/coro/Invoke.h folly/experimental/coro/Merge-inl.h -> folly/coro/Merge-inl.h folly/experimental/coro/Merge.h -> folly/coro/Merge.h folly/experimental/coro/Mutex.h -> folly/coro/Mutex.h folly/experimental/coro/Promise.h -> folly/coro/Promise.h folly/experimental/coro/Result.h -> folly/coro/Result.h folly/experimental/coro/Retry.h -> folly/coro/Retry.h folly/experimental/coro/RustAdaptors.h -> folly/coro/RustAdaptors.h folly/experimental/coro/ScopeExit.h -> folly/coro/ScopeExit.h folly/experimental/coro/SharedLock.h -> folly/coro/SharedLock.h folly/experimental/coro/SharedMutex.h -> folly/coro/SharedMutex.h folly/experimental/coro/Sleep-inl.h -> folly/coro/Sleep-inl.h folly/experimental/coro/Sleep.h -> folly/coro/Sleep.h folly/experimental/coro/SmallUnboundedQueue.h -> folly/coro/SmallUnboundedQueue.h folly/experimental/coro/Task.h -> folly/coro/Task.h folly/experimental/coro/TimedWait.h -> folly/coro/TimedWait.h folly/experimental/coro/Timeout-inl.h -> folly/coro/Timeout-inl.h folly/experimental/coro/Timeout.h -> folly/coro/Timeout.h folly/experimental/coro/Traits.h -> folly/coro/Traits.h folly/experimental/coro/Transform-inl.h -> folly/coro/Transform-inl.h folly/experimental/coro/Transform.h -> folly/coro/Transform.h folly/experimental/coro/UnboundedQueue.h -> folly/coro/UnboundedQueue.h folly/experimental/coro/ViaIfAsync.h -> folly/coro/ViaIfAsync.h folly/experimental/coro/WithAsyncStack.h -> folly/coro/WithAsyncStack.h folly/experimental/coro/WithCancellation.h -> folly/coro/WithCancellation.h folly/experimental/coro/BoundedQueue.h -> folly/coro/BoundedQueue.h folly/experimental/coro/SharedPromise.h -> folly/coro/SharedPromise.h folly/experimental/coro/Cleanup.h -> folly/coro/Cleanup.h folly/experimental/coro/AutoCleanup-fwd.h -> folly/coro/AutoCleanup-fwd.h folly/experimental/coro/AutoCleanup.h -> folly/coro/AutoCleanup.h ``` This is a codemod. It was automatically generated and will be landed once it is approved and tests are passing in sandcastle. You have been added as a reviewer by Sentinel or Butterfly. Autodiff project: dcoro3 Autodiff partition: fbcode.folly Autodiff bookmark: ad.dcoro3.fbcode.folly Reviewed By: skrueger Differential Revision: D65889424 fbshipit-source-id: db88ab0a52e80e7a4a5eb5f5482b1fc6c67e1551
facebook · Nov 14, 2024 · 2f94455 · 2f94455
1 parent 2cdfc40
commit 2f94455
Show file tree

Hide file tree

Showing 45 changed files with 156 additions and 156 deletions.
diff --git a/third-party/folly/src/folly/coro/Accumulate.h b/third-party/folly/src/folly/coro/Accumulate.h
@@ -16,9 +16,9 @@
 
 #pragma once
 
-#include <folly/experimental/coro/AsyncGenerator.h>
-#include <folly/experimental/coro/Coroutine.h>
-#include <folly/experimental/coro/Task.h>
+#include <folly/coro/AsyncGenerator.h>
+#include <folly/coro/Coroutine.h>
+#include <folly/coro/Task.h>
 
 #if FOLLY_HAS_COROUTINES
 

diff --git a/third-party/folly/src/folly/coro/AsyncGenerator.h b/third-party/folly/src/folly/coro/AsyncGenerator.h
@@ -24,17 +24,17 @@
 #include <folly/ExceptionWrapper.h>
 #include <folly/Traits.h>
 #include <folly/Try.h>
-#include <folly/experimental/coro/AutoCleanup-fwd.h>
-#include <folly/experimental/coro/Coroutine.h>
-#include <folly/experimental/coro/CurrentExecutor.h>
-#include <folly/experimental/coro/Invoke.h>
-#include <folly/experimental/coro/Result.h>
-#include <folly/experimental/coro/ScopeExit.h>
-#include <folly/experimental/coro/ViaIfAsync.h>
-#include <folly/experimental/coro/WithAsyncStack.h>
-#include <folly/experimental/coro/WithCancellation.h>
-#include <folly/experimental/coro/detail/Malloc.h>
-#include <folly/experimental/coro/detail/ManualLifetime.h>
+#include <folly/coro/AutoCleanup-fwd.h>
+#include <folly/coro/Coroutine.h>
+#include <folly/coro/CurrentExecutor.h>
+#include <folly/coro/Invoke.h>
+#include <folly/coro/Result.h>
+#include <folly/coro/ScopeExit.h>
+#include <folly/coro/ViaIfAsync.h>
+#include <folly/coro/WithAsyncStack.h>
+#include <folly/coro/WithCancellation.h>
+#include <folly/coro/detail/Malloc.h>
+#include <folly/coro/detail/ManualLifetime.h>
 #include <folly/tracing/AsyncStack.h>
 
 #include <glog/logging.h>

diff --git a/third-party/folly/src/folly/coro/AsyncPipe.h b/third-party/folly/src/folly/coro/AsyncPipe.h
@@ -17,11 +17,11 @@
 #pragma once
 
 #include <folly/Try.h>
-#include <folly/experimental/coro/AsyncGenerator.h>
-#include <folly/experimental/coro/Coroutine.h>
-#include <folly/experimental/coro/Invoke.h>
-#include <folly/experimental/coro/SmallUnboundedQueue.h>
-#include <folly/experimental/coro/ViaIfAsync.h>
+#include <folly/coro/AsyncGenerator.h>
+#include <folly/coro/Coroutine.h>
+#include <folly/coro/Invoke.h>
+#include <folly/coro/SmallUnboundedQueue.h>
+#include <folly/coro/ViaIfAsync.h>
 #include <folly/fibers/Semaphore.h>
 
 #include <memory>

diff --git a/third-party/folly/src/folly/coro/AsyncScope.h b/third-party/folly/src/folly/coro/AsyncScope.h
@@ -22,11 +22,11 @@
 
 #include <folly/CancellationToken.h>
 #include <folly/ExceptionWrapper.h>
-#include <folly/experimental/coro/Coroutine.h>
-#include <folly/experimental/coro/CurrentExecutor.h>
-#include <folly/experimental/coro/Task.h>
-#include <folly/experimental/coro/detail/Barrier.h>
-#include <folly/experimental/coro/detail/BarrierTask.h>
+#include <folly/coro/Coroutine.h>
+#include <folly/coro/CurrentExecutor.h>
+#include <folly/coro/Task.h>
+#include <folly/coro/detail/Barrier.h>
+#include <folly/coro/detail/BarrierTask.h>
 #include <folly/futures/Future.h>
 #include <folly/portability/SourceLocation.h>
 

diff --git a/third-party/folly/src/folly/coro/AsyncStack.h b/third-party/folly/src/folly/coro/AsyncStack.h
@@ -15,8 +15,8 @@
  */
 
 #include <folly/Executor.h>
-#include <folly/experimental/coro/Coroutine.h>
-#include <folly/experimental/coro/WithAsyncStack.h>
+#include <folly/coro/Coroutine.h>
+#include <folly/coro/WithAsyncStack.h>
 #include <folly/tracing/AsyncStack.h>
 
 #include <utility>

diff --git a/third-party/folly/src/folly/coro/AutoCleanup-fwd.h b/third-party/folly/src/folly/coro/AutoCleanup-fwd.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <folly/experimental/coro/Cleanup.h>
-#include <folly/experimental/coro/Coroutine.h>
+#include <folly/coro/Cleanup.h>
+#include <folly/coro/Coroutine.h>
 
 #if FOLLY_HAS_COROUTINES
 

diff --git a/third-party/folly/src/folly/coro/AutoCleanup.h b/third-party/folly/src/folly/coro/AutoCleanup.h
@@ -16,9 +16,9 @@
 
 #pragma once
 
-#include <folly/experimental/coro/AutoCleanup-fwd.h>
-#include <folly/experimental/coro/Collect.h>
-#include <folly/experimental/coro/Task.h>
+#include <folly/coro/AutoCleanup-fwd.h>
+#include <folly/coro/Collect.h>
+#include <folly/coro/Task.h>
 
 #if FOLLY_HAS_COROUTINES
 

diff --git a/third-party/folly/src/folly/coro/Baton.cpp b/third-party/folly/src/folly/coro/Baton.cpp
@@ -16,7 +16,7 @@
 
 #include <folly/coro/Baton.h>
 
-#include <folly/experimental/coro/Coroutine.h>
+#include <folly/coro/Coroutine.h>
 #include <folly/synchronization/AtomicUtil.h>
 
 #include <cassert>

diff --git a/third-party/folly/src/folly/coro/Baton.h b/third-party/folly/src/folly/coro/Baton.h
@@ -19,7 +19,7 @@
 #include <atomic>
 
 #include <folly/Try.h>
-#include <folly/experimental/coro/Coroutine.h>
+#include <folly/coro/Coroutine.h>
 
 #if FOLLY_HAS_COROUTINES
 

diff --git a/third-party/folly/src/folly/coro/BlockingWait.h b/third-party/folly/src/folly/coro/BlockingWait.h
@@ -17,14 +17,14 @@
 #pragma once
 
 #include <folly/Try.h>
+#include <folly/coro/Coroutine.h>
+#include <folly/coro/Task.h>
+#include <folly/coro/Traits.h>
+#include <folly/coro/ViaIfAsync.h>
+#include <folly/coro/WithAsyncStack.h>
+#include <folly/coro/detail/Malloc.h>
+#include <folly/coro/detail/Traits.h>
 #include <folly/executors/ManualExecutor.h>
-#include <folly/experimental/coro/Coroutine.h>
-#include <folly/experimental/coro/Task.h>
-#include <folly/experimental/coro/Traits.h>
-#include <folly/experimental/coro/ViaIfAsync.h>
-#include <folly/experimental/coro/WithAsyncStack.h>
-#include <folly/experimental/coro/detail/Malloc.h>
-#include <folly/experimental/coro/detail/Traits.h>
 #include <folly/fibers/Baton.h>
 #include <folly/synchronization/Baton.h>
 #include <folly/tracing/AsyncStack.h>

diff --git a/third-party/folly/src/folly/coro/BoundedQueue.h b/third-party/folly/src/folly/coro/BoundedQueue.h
@@ -18,7 +18,7 @@
 
 #include <folly/MPMCQueue.h>
 #include <folly/ProducerConsumerQueue.h>
-#include <folly/experimental/coro/Task.h>
+#include <folly/coro/Task.h>
 #include <folly/fibers/Semaphore.h>
 
 #if FOLLY_HAS_COROUTINES

diff --git a/third-party/folly/src/folly/coro/Collect-inl.h b/third-party/folly/src/folly/coro/Collect-inl.h
@@ -19,13 +19,13 @@
 
 #include <folly/CancellationToken.h>
 #include <folly/ExceptionWrapper.h>
-#include <folly/experimental/coro/AsyncPipe.h>
-#include <folly/experimental/coro/AsyncScope.h>
-#include <folly/experimental/coro/Mutex.h>
-#include <folly/experimental/coro/detail/Barrier.h>
-#include <folly/experimental/coro/detail/BarrierTask.h>
-#include <folly/experimental/coro/detail/CurrentAsyncFrame.h>
-#include <folly/experimental/coro/detail/Helpers.h>
+#include <folly/coro/AsyncPipe.h>
+#include <folly/coro/AsyncScope.h>
+#include <folly/coro/Mutex.h>
+#include <folly/coro/detail/Barrier.h>
+#include <folly/coro/detail/BarrierTask.h>
+#include <folly/coro/detail/CurrentAsyncFrame.h>
+#include <folly/coro/detail/Helpers.h>
 
 #if FOLLY_HAS_COROUTINES
 

diff --git a/third-party/folly/src/folly/coro/Collect.h b/third-party/folly/src/folly/coro/Collect.h
@@ -20,12 +20,12 @@
 #include <folly/Unit.h>
 #include <folly/container/Access.h>
 #include <folly/container/Iterator.h>
-#include <folly/experimental/coro/AsyncGenerator.h>
-#include <folly/experimental/coro/AsyncScope.h>
-#include <folly/experimental/coro/Coroutine.h>
-#include <folly/experimental/coro/Task.h>
-#include <folly/experimental/coro/ViaIfAsync.h>
-#include <folly/experimental/coro/detail/Traits.h>
+#include <folly/coro/AsyncGenerator.h>
+#include <folly/coro/AsyncScope.h>
+#include <folly/coro/Coroutine.h>
+#include <folly/coro/Task.h>
+#include <folly/coro/ViaIfAsync.h>
+#include <folly/coro/detail/Traits.h>
 
 #include <functional>
 #include <iterator>

diff --git a/third-party/folly/src/folly/coro/Concat-inl.h b/third-party/folly/src/folly/coro/Concat-inl.h
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <folly/experimental/coro/Coroutine.h>
+#include <folly/coro/Coroutine.h>
 
 namespace folly {
 namespace coro {

diff --git a/third-party/folly/src/folly/coro/Concat.h b/third-party/folly/src/folly/coro/Concat.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <folly/experimental/coro/AsyncGenerator.h>
-#include <folly/experimental/coro/Coroutine.h>
+#include <folly/coro/AsyncGenerator.h>
+#include <folly/coro/Coroutine.h>
 
 #if FOLLY_HAS_COROUTINES
 

diff --git a/third-party/folly/src/folly/coro/CurrentExecutor.h b/third-party/folly/src/folly/coro/CurrentExecutor.h
@@ -19,9 +19,9 @@
 #include <utility>
 
 #include <folly/Executor.h>
-#include <folly/experimental/coro/Coroutine.h>
-#include <folly/experimental/coro/ViaIfAsync.h>
-#include <folly/experimental/coro/WithAsyncStack.h>
+#include <folly/coro/Coroutine.h>
+#include <folly/coro/ViaIfAsync.h>
+#include <folly/coro/WithAsyncStack.h>
 #include <folly/io/async/Request.h>
 
 #if FOLLY_HAS_COROUTINES

diff --git a/third-party/folly/src/folly/coro/DetachOnCancel.h b/third-party/folly/src/folly/coro/DetachOnCancel.h
@@ -18,12 +18,12 @@
 
 #include <type_traits>
 
-#include <folly/experimental/coro/Baton.h>
-#include <folly/experimental/coro/Coroutine.h>
-#include <folly/experimental/coro/Invoke.h>
-#include <folly/experimental/coro/Task.h>
-#include <folly/experimental/coro/Traits.h>
-#include <folly/experimental/coro/detail/Helpers.h>
+#include <folly/coro/Baton.h>
+#include <folly/coro/Coroutine.h>
+#include <folly/coro/Invoke.h>
+#include <folly/coro/Task.h>
+#include <folly/coro/Traits.h>
+#include <folly/coro/detail/Helpers.h>
 
 #if FOLLY_HAS_COROUTINES
 

diff --git a/third-party/folly/src/folly/coro/Filter.h b/third-party/folly/src/folly/coro/Filter.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <folly/experimental/coro/AsyncGenerator.h>
-#include <folly/experimental/coro/Coroutine.h>
+#include <folly/coro/AsyncGenerator.h>
+#include <folly/coro/Coroutine.h>
 
 #if FOLLY_HAS_COROUTINES
 

diff --git a/third-party/folly/src/folly/coro/FutureUtil.h b/third-party/folly/src/folly/coro/FutureUtil.h
@@ -17,12 +17,12 @@
 #pragma once
 
 #include <folly/CancellationToken.h>
-#include <folly/experimental/coro/Baton.h>
-#include <folly/experimental/coro/Coroutine.h>
-#include <folly/experimental/coro/CurrentExecutor.h>
-#include <folly/experimental/coro/Invoke.h>
-#include <folly/experimental/coro/Task.h>
-#include <folly/experimental/coro/Traits.h>
+#include <folly/coro/Baton.h>
+#include <folly/coro/Coroutine.h>
+#include <folly/coro/CurrentExecutor.h>
+#include <folly/coro/Invoke.h>
+#include <folly/coro/Task.h>
+#include <folly/coro/Traits.h>
 #include <folly/futures/Future.h>
 
 #if FOLLY_HAS_COROUTINES

diff --git a/third-party/folly/src/folly/coro/Generator.h b/third-party/folly/src/folly/coro/Generator.h
@@ -21,8 +21,8 @@
 #include <type_traits>
 #include <utility>
 
-#include <folly/experimental/coro/Coroutine.h>
-#include <folly/experimental/coro/Invoke.h>
+#include <folly/coro/Coroutine.h>
+#include <folly/coro/Invoke.h>
 #include <folly/lang/Exception.h>
 
 #if FOLLY_HAS_COROUTINES

diff --git a/third-party/folly/src/folly/coro/GmockHelpers.h b/third-party/folly/src/folly/coro/GmockHelpers.h
@@ -19,10 +19,10 @@
 #include <atomic>
 #include <type_traits>
 
-#include <folly/experimental/coro/Coroutine.h>
-#include <folly/experimental/coro/GtestHelpers.h>
-#include <folly/experimental/coro/Result.h>
-#include <folly/experimental/coro/Task.h>
+#include <folly/coro/Coroutine.h>
+#include <folly/coro/GtestHelpers.h>
+#include <folly/coro/Result.h>
+#include <folly/coro/Task.h>
 #include <folly/portability/GMock.h>
 
 #if FOLLY_HAS_COROUTINES

diff --git a/third-party/folly/src/folly/coro/GtestHelpers.h b/third-party/folly/src/folly/coro/GtestHelpers.h
@@ -16,10 +16,10 @@
 
 #pragma once
 
+#include <folly/coro/BlockingWait.h>
+#include <folly/coro/Coroutine.h>
+#include <folly/coro/Task.h>
 #include <folly/debugging/exception_tracer/SmartExceptionTracer.h>
-#include <folly/experimental/coro/BlockingWait.h>
-#include <folly/experimental/coro/Coroutine.h>
-#include <folly/experimental/coro/Task.h>
 #include <folly/portability/GTest.h>
 
 #if FOLLY_HAS_COROUTINES

diff --git a/third-party/folly/src/folly/coro/Merge-inl.h b/third-party/folly/src/folly/coro/Merge-inl.h
@@ -20,15 +20,15 @@
 #include <folly/CancellationToken.h>
 #include <folly/Executor.h>
 #include <folly/ScopeGuard.h>
-#include <folly/experimental/coro/Baton.h>
-#include <folly/experimental/coro/Mutex.h>
-#include <folly/experimental/coro/Task.h>
-#include <folly/experimental/coro/ViaIfAsync.h>
-#include <folly/experimental/coro/WithCancellation.h>
-#include <folly/experimental/coro/detail/Barrier.h>
-#include <folly/experimental/coro/detail/BarrierTask.h>
-#include <folly/experimental/coro/detail/CurrentAsyncFrame.h>
-#include <folly/experimental/coro/detail/Helpers.h>
+#include <folly/coro/Baton.h>
+#include <folly/coro/Mutex.h>
+#include <folly/coro/Task.h>
+#include <folly/coro/ViaIfAsync.h>
+#include <folly/coro/WithCancellation.h>
+#include <folly/coro/detail/Barrier.h>
+#include <folly/coro/detail/BarrierTask.h>
+#include <folly/coro/detail/CurrentAsyncFrame.h>
+#include <folly/coro/detail/Helpers.h>
 
 #if FOLLY_HAS_COROUTINES
 

diff --git a/third-party/folly/src/folly/coro/Merge.h b/third-party/folly/src/folly/coro/Merge.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <folly/experimental/coro/AsyncGenerator.h>
-#include <folly/experimental/coro/Coroutine.h>
+#include <folly/coro/AsyncGenerator.h>
+#include <folly/coro/Coroutine.h>
 
 #if FOLLY_HAS_COROUTINES
 

diff --git a/third-party/folly/src/folly/coro/Mutex.h b/third-party/folly/src/folly/coro/Mutex.h
@@ -17,8 +17,8 @@
 #pragma once
 
 #include <folly/Executor.h>
-#include <folly/experimental/coro/Coroutine.h>
-#include <folly/experimental/coro/ViaIfAsync.h>
+#include <folly/coro/Coroutine.h>
+#include <folly/coro/ViaIfAsync.h>
 
 #include <atomic>
 #include <mutex>

diff --git a/third-party/folly/src/folly/coro/Promise.h b/third-party/folly/src/folly/coro/Promise.h
@@ -20,8 +20,8 @@
 
 #include <folly/CancellationToken.h>
 #include <folly/Try.h>
-#include <folly/experimental/coro/Baton.h>
-#include <folly/experimental/coro/Coroutine.h>
+#include <folly/coro/Baton.h>
+#include <folly/coro/Coroutine.h>
 #include <folly/futures/Promise.h>
 #include <folly/synchronization/RelaxedAtomic.h>
 

diff --git a/third-party/folly/src/folly/coro/Retry.h b/third-party/folly/src/folly/coro/Retry.h
@@ -25,11 +25,11 @@
 #include <folly/ExceptionWrapper.h>
 #include <folly/Random.h>
 #include <folly/Try.h>
-#include <folly/experimental/coro/Coroutine.h>
-#include <folly/experimental/coro/Result.h>
-#include <folly/experimental/coro/Sleep.h>
-#include <folly/experimental/coro/Task.h>
-#include <folly/experimental/coro/Traits.h>
+#include <folly/coro/Coroutine.h>
+#include <folly/coro/Result.h>
+#include <folly/coro/Sleep.h>
+#include <folly/coro/Task.h>
+#include <folly/coro/Traits.h>
 
 #include <cstdint>
 #include <random>