Skip to content

Commit

Permalink
Deshim coro in fbcode/thrift
Browse files Browse the repository at this point in the history 
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.h -> folly/coro/Accumulate.h
folly/experimental/coro/Accumulate-inl.h -> folly/coro/Accumulate-inl.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.h -> folly/coro/Collect.h
folly/experimental/coro/Collect-inl.h -> folly/coro/Collect-inl.h
folly/experimental/coro/Concat.h -> folly/coro/Concat.h
folly/experimental/coro/Concat-inl.h -> folly/coro/Concat-inl.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.h -> folly/coro/Filter.h
folly/experimental/coro/Filter-inl.h -> folly/coro/Filter-inl.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.h -> folly/coro/Merge.h
folly/experimental/coro/Merge-inl.h -> folly/coro/Merge-inl.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.h -> folly/coro/Sleep.h
folly/experimental/coro/Sleep-inl.h -> folly/coro/Sleep-inl.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.h -> folly/coro/Timeout.h
folly/experimental/coro/Timeout-inl.h -> folly/coro/Timeout-inl.h
folly/experimental/coro/Traits.h -> folly/coro/Traits.h
folly/experimental/coro/Transform.h -> folly/coro/Transform.h
folly/experimental/coro/Transform-inl.h -> folly/coro/Transform-inl.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: dcoro
Autodiff partition: fbcode.thrift
Autodiff bookmark: ad.dcoro.fbcode.thrift

Reviewed By: dtolnay

Differential Revision: D62965838

fbshipit-source-id: c0d6013ea5432669ca6887a5dffa85de1bdb2c9e
  • Loading branch information
@Gownta @facebook-github-bot
Gownta authored and facebook-github-bot committed Sep 19, 2024
1 parent 62e1084 commit 4126978
Show file tree
Hide file tree
Showing 61 changed files with 122 additions and 122 deletions.
6 changes: 3 additions & 3 deletions third-party/thrift/src/thrift/conformance/GTestHarness.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
#include <stdexcept>

#include <folly/ExceptionString.h>
#include <folly/experimental/coro/AsyncGenerator.h>
#include <folly/experimental/coro/BlockingWait.h>
#include <folly/experimental/coro/Sleep.h>
#include <folly/coro/AsyncGenerator.h>
#include <folly/coro/BlockingWait.h>
#include <folly/coro/Sleep.h>
#include <thrift/conformance/RpcStructComparator.h>
#include <thrift/conformance/Utils.h>
#include <thrift/conformance/if/gen-cpp2/rpc_types.h>
Expand Down
6 changes: 3 additions & 3 deletions third-party/thrift/src/thrift/conformance/cpp2/RPCClient.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
#include <glog/logging.h>
#include <folly/init/Init.h>

#include <folly/experimental/coro/AsyncGenerator.h>
#include <folly/experimental/coro/BlockingWait.h>
#include <folly/experimental/coro/Sleep.h>
#include <folly/coro/AsyncGenerator.h>
#include <folly/coro/BlockingWait.h>
#include <folly/coro/Sleep.h>
#include <folly/io/async/AsyncSocket.h>
#include <folly/io/async/AsyncTransport.h>

Expand Down
6 changes: 3 additions & 3 deletions third-party/thrift/src/thrift/conformance/rpcclient/GTestHarnessRPCClient.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@

#include <fmt/core.h>
#include <folly/Subprocess.h>
#include <folly/experimental/coro/AsyncGenerator.h>
#include <folly/experimental/coro/BlockingWait.h>
#include <folly/experimental/coro/Sleep.h>
#include <folly/coro/AsyncGenerator.h>
#include <folly/coro/BlockingWait.h>
#include <folly/coro/Sleep.h>
#include <folly/futures/Future.h>
#include <thrift/conformance/PluggableFunctions.h>
#include <thrift/conformance/RpcStructComparator.h>
Expand Down
2 changes: 1 addition & 1 deletion third-party/thrift/src/thrift/conformance/rpcserver/RPCServerConformanceHandler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <chrono>
#include <exception>

#include <folly/experimental/coro/AsyncGenerator.h>
#include <folly/coro/AsyncGenerator.h>

namespace apache::thrift::conformance {

Expand Down
8 changes: 4 additions & 4 deletions third-party/thrift/src/thrift/conformance/stresstest/StressTest.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
// rule. Until then, extra dependencies must be added manually. For convenience
// reasons, we include a few useful coroutine headers here for use in stress
// test definitions.
#include <folly/experimental/coro/AsyncScope.h>
#include <folly/experimental/coro/Collect.h>
#include <folly/experimental/coro/Sleep.h>
#include <folly/experimental/coro/Task.h>
#include <folly/coro/AsyncScope.h>
#include <folly/coro/Collect.h>
#include <folly/coro/Sleep.h>
#include <folly/coro/Task.h>

#define THRIFT_STRESS_TEST(name) \
class THRIFT_STRESS_TEST__##name \
Expand Down
4 changes: 2 additions & 2 deletions third-party/thrift/src/thrift/conformance/stresstest/client/BaseLoadGenerator.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

namespace apache {
namespace thrift {
Expand Down
2 changes: 1 addition & 1 deletion third-party/thrift/src/thrift/conformance/stresstest/client/ClientRunner.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#include <thrift/conformance/stresstest/client/ClientRunner.h>

#include <folly/experimental/coro/BlockingWait.h>
#include <folly/coro/BlockingWait.h>
#include <thrift/conformance/stresstest/util/Util.h>

#include <folly/experimental/io/IoUringBackend.h>
Expand Down
4 changes: 2 additions & 2 deletions third-party/thrift/src/thrift/conformance/stresstest/client/ClientRunner.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

#pragma once

#include <folly/experimental/coro/AsyncScope.h>
#include <folly/experimental/coro/Task.h>
#include <folly/coro/AsyncScope.h>
#include <folly/coro/Task.h>
#include <folly/io/async/HHWheelTimer.h>
#include <folly/io/async/ScopedEventBaseThread.h>
#include <folly/synchronization/RelaxedAtomic.h>
Expand Down
2 changes: 1 addition & 1 deletion third-party/thrift/src/thrift/conformance/stresstest/client/PoissonLoadGenerator.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#include <chrono>
#include <cmath>
#include <random>
#include <folly/coro/SmallUnboundedQueue.h>
#include <folly/executors/FunctionScheduler.h>
#include <folly/experimental/coro/SmallUnboundedQueue.h>
#include <thrift/conformance/stresstest/client/BaseLoadGenerator.h>

namespace apache {
Expand Down
2 changes: 1 addition & 1 deletion third-party/thrift/src/thrift/conformance/stresstest/client/StressTestBase.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#pragma once

#include <folly/experimental/coro/Task.h>
#include <folly/coro/Task.h>
#include <thrift/conformance/stresstest/client/StressTestClient.h>

namespace apache {
Expand Down
2 changes: 1 addition & 1 deletion third-party/thrift/src/thrift/conformance/stresstest/client/StressTestClient.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#include <thrift/conformance/stresstest/client/StressTestClient.h>

#include <folly/experimental/coro/Sleep.h>
#include <folly/coro/Sleep.h>

namespace apache {
namespace thrift {
Expand Down
2 changes: 1 addition & 1 deletion third-party/thrift/src/thrift/conformance/stresstest/client/StressTestClient.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#pragma once

#include <folly/experimental/coro/Task.h>
#include <folly/coro/Task.h>
#include <folly/stats/Histogram.h>
#include <thrift/conformance/stresstest/if/gen-cpp2/StressTest.h>

Expand Down
8 changes: 4 additions & 4 deletions third-party/thrift/src/thrift/conformance/stresstest/server/StressTestHandler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

#include <thrift/conformance/stresstest/server/StressTestHandler.h>

#include <folly/experimental/coro/AsyncGenerator.h>
#include <folly/experimental/coro/Collect.h>
#include <folly/experimental/coro/Sleep.h>
#include <folly/experimental/coro/Task.h>
#include <folly/coro/AsyncGenerator.h>
#include <folly/coro/Collect.h>
#include <folly/coro/Sleep.h>
#include <folly/coro/Task.h>

namespace apache {
namespace thrift {
Expand Down
2 changes: 1 addition & 1 deletion third-party/thrift/src/thrift/lib/cpp/server/test/ServerEventHandlerTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#include <folly/portability/GTest.h>

#include <folly/experimental/coro/GtestHelpers.h>
#include <folly/coro/GtestHelpers.h>
#include <thrift/lib/cpp/server/test/TrackingTServerEventHandler.h>
#include <thrift/lib/cpp2/server/ServerModule.h>
#include <thrift/lib/cpp2/server/ThriftServer.h>
Expand Down
2 changes: 1 addition & 1 deletion third-party/thrift/src/thrift/lib/cpp2/GeneratedCodeHelper.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include <fmt/core.h>
#include <folly/Traits.h>
#include <folly/Utility.h>
#include <folly/experimental/coro/FutureUtil.h>
#include <folly/coro/FutureUtil.h>
#include <folly/futures/Future.h>
#include <folly/io/Cursor.h>
#include <thrift/lib/cpp/protocol/TBase64Utils.h>
Expand Down
4 changes: 2 additions & 2 deletions third-party/thrift/src/thrift/lib/cpp2/async/ClientBufferedStream.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@

#include <folly/GLog.h>
#include <folly/Portability.h>
#include <folly/experimental/coro/AsyncGenerator.h>
#include <folly/experimental/coro/Baton.h>
#include <folly/coro/AsyncGenerator.h>
#include <folly/coro/Baton.h>
#include <folly/futures/Future.h>
#include <folly/io/async/fdsock/SocketFds.h>
#include <folly/synchronization/Baton.h>
Expand Down
6 changes: 3 additions & 3 deletions third-party/thrift/src/thrift/lib/cpp2/async/ClientSinkBridge.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

#include <folly/CancellationToken.h>
#include <folly/Portability.h>
#include <folly/experimental/coro/AsyncGenerator.h>
#include <folly/experimental/coro/Baton.h>
#include <folly/experimental/coro/Task.h>
#include <folly/coro/AsyncGenerator.h>
#include <folly/coro/Baton.h>
#include <folly/coro/Task.h>

#include <thrift/lib/cpp2/async/SinkBridgeUtil.h>
#include <thrift/lib/cpp2/async/StreamCallbacks.h>
Expand Down
2 changes: 1 addition & 1 deletion third-party/thrift/src/thrift/lib/cpp2/async/Interaction.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <forward_list>

#include <folly/ExceptionWrapper.h>
#include <folly/experimental/coro/Task.h>
#include <folly/coro/Task.h>
#include <folly/io/async/EventBase.h>
#include <thrift/lib/cpp/concurrency/ThreadManager.h>

Expand Down
8 changes: 4 additions & 4 deletions third-party/thrift/src/thrift/lib/cpp2/async/ServerGeneratorStream.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@

#include <folly/Portability.h>
#include <folly/Try.h>
#include <folly/experimental/coro/AsyncGenerator.h>
#include <folly/experimental/coro/Baton.h>
#include <folly/experimental/coro/Invoke.h>
#include <folly/experimental/coro/Task.h>
#include <folly/coro/AsyncGenerator.h>
#include <folly/coro/Baton.h>
#include <folly/coro/Invoke.h>
#include <folly/coro/Task.h>
#include <thrift/lib/cpp2/async/ServerStreamDetail.h>
#include <thrift/lib/cpp2/async/StreamCallbacks.h>
#include <thrift/lib/cpp2/async/TwoWayBridge.h>
Expand Down
6 changes: 3 additions & 3 deletions third-party/thrift/src/thrift/lib/cpp2/async/ServerSinkBridge.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
#include <folly/Portability.h>

#if FOLLY_HAS_COROUTINES
#include <folly/experimental/coro/AsyncGenerator.h>
#include <folly/experimental/coro/Baton.h>
#include <folly/experimental/coro/Task.h>
#include <folly/coro/AsyncGenerator.h>
#include <folly/coro/Baton.h>
#include <folly/coro/Task.h>

#include <thrift/lib/cpp2/async/SinkBridgeUtil.h>
#endif
Expand Down
2 changes: 1 addition & 1 deletion third-party/thrift/src/thrift/lib/cpp2/async/ServerStream.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

#include <folly/Portability.h>
#include <folly/Try.h>
#include <folly/coro/AsyncGenerator.h>
#include <folly/executors/GlobalExecutor.h>
#include <folly/experimental/coro/AsyncGenerator.h>
#include <thrift/lib/cpp2/async/ClientBufferedStream.h>
#include <thrift/lib/cpp2/async/RpcTypes.h>
#include <thrift/lib/cpp2/async/ServerGeneratorStream.h>
Expand Down
4 changes: 2 additions & 2 deletions third-party/thrift/src/thrift/lib/cpp2/async/Sink.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

#include <folly/Portability.h>
#include <folly/Try.h>
#include <folly/experimental/coro/AsyncGenerator.h>
#include <folly/experimental/coro/Task.h>
#include <folly/coro/AsyncGenerator.h>
#include <folly/coro/Task.h>

#include <thrift/lib/cpp/TApplicationException.h>
#include <thrift/lib/cpp2/async/ClientSinkBridge.h>
Expand Down
4 changes: 2 additions & 2 deletions third-party/thrift/src/thrift/lib/cpp2/async/SinkBridgeUtil.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
#include <variant>

#include <folly/Portability.h>
#include <folly/experimental/coro/Baton.h>
#include <folly/experimental/coro/Task.h>
#include <folly/coro/Baton.h>
#include <folly/coro/Task.h>

#include <thrift/lib/cpp2/async/StreamCallbacks.h>

Expand Down
2 changes: 1 addition & 1 deletion third-party/thrift/src/thrift/lib/cpp2/async/tests/AsyncClientTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

#include <folly/experimental/coro/GtestHelpers.h>
#include <folly/coro/GtestHelpers.h>
#include <folly/portability/GTest.h>

#include <thrift/lib/cpp2/async/AsyncClient.h>
Expand Down
2 changes: 1 addition & 1 deletion third-party/thrift/src/thrift/lib/cpp2/async/tests/ClientBufferedStreamTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#include <thrift/lib/cpp2/async/ClientBufferedStream.h>

#include <folly/experimental/coro/Baton.h>
#include <folly/coro/Baton.h>
#include <folly/io/async/ScopedEventBaseThread.h>
#include <folly/portability/GTest.h>
#include <thrift/lib/cpp2/async/ServerStream.h>
Expand Down
2 changes: 1 addition & 1 deletion third-party/thrift/src/thrift/lib/cpp2/async/tests/ClientInterceptorTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

#include <folly/experimental/coro/GtestHelpers.h>
#include <folly/coro/GtestHelpers.h>
#include <folly/portability/GMock.h>
#include <folly/portability/GTest.h>

Expand Down
6 changes: 3 additions & 3 deletions third-party/thrift/src/thrift/lib/cpp2/async/tests/ServerStreamTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

#include <thrift/lib/cpp2/async/ServerStream.h>

#include <folly/experimental/coro/Baton.h>
#include <folly/experimental/coro/BlockingWait.h>
#include <folly/experimental/coro/Sleep.h>
#include <folly/coro/Baton.h>
#include <folly/coro/BlockingWait.h>
#include <folly/coro/Sleep.h>
#include <folly/io/async/ScopedEventBaseThread.h>
#include <folly/portability/GTest.h>
#include <folly/synchronization/Baton.h>
Expand Down
2 changes: 1 addition & 1 deletion third-party/thrift/src/thrift/lib/cpp2/async/tests/SinkServiceTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#include <folly/portability/GTest.h>

#include <folly/experimental/coro/Sleep.h>
#include <folly/coro/Sleep.h>
#include <thrift/lib/cpp2/GeneratedCodeHelper.h>
#include <thrift/lib/cpp2/async/tests/util/Util.h>

Expand Down
4 changes: 2 additions & 2 deletions third-party/thrift/src/thrift/lib/cpp2/async/tests/StreamServiceTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

#include <folly/portability/GTest.h>

#include <folly/experimental/coro/Collect.h>
#include <folly/experimental/coro/Sleep.h>
#include <folly/coro/Collect.h>
#include <folly/coro/Sleep.h>
#include <thrift/lib/cpp2/GeneratedCodeHelper.h>
#include <thrift/lib/cpp2/async/tests/util/Util.h>

Expand Down
2 changes: 1 addition & 1 deletion third-party/thrift/src/thrift/lib/cpp2/async/tests/util/TestSinkService.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <thrift/lib/cpp2/async/tests/util/TestSinkService.h>

#include <folly/ScopeGuard.h>
#include <folly/experimental/coro/Sleep.h>
#include <folly/coro/Sleep.h>
#include <folly/portability/GTest.h>

namespace apache::thrift::detail::test {
Expand Down
2 changes: 1 addition & 1 deletion third-party/thrift/src/thrift/lib/cpp2/async/tests/util/TestStreamService.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <thrift/lib/cpp2/async/tests/util/TestStreamService.h>
#include <thrift/lib/cpp2/transport/rocket/server/RocketStreamClientCallback.h>

#include <folly/experimental/coro/AsyncScope.h>
#include <folly/coro/AsyncScope.h>
#include <folly/portability/GTest.h>

namespace apache::thrift::detail::test {
Expand Down
4 changes: 2 additions & 2 deletions third-party/thrift/src/thrift/lib/cpp2/async/tests/util/Util.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
#pragma once

#include <folly/SocketAddress.h>
#include <folly/experimental/coro/BlockingWait.h>
#include <folly/experimental/coro/Task.h>
#include <folly/coro/BlockingWait.h>
#include <folly/coro/Task.h>
#include <folly/io/async/AsyncSocket.h>
#include <folly/io/async/ScopedEventBaseThread.h>
#include <folly/synchronization/Baton.h>
Expand Down
6 changes: 3 additions & 3 deletions third-party/thrift/src/thrift/lib/cpp2/gen/client_h.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

#pragma once

#include <folly/experimental/coro/DetachOnCancel.h>
#include <folly/experimental/coro/Result.h>
#include <folly/experimental/coro/Task.h>
#include <folly/coro/DetachOnCancel.h>
#include <folly/coro/Result.h>
#include <folly/coro/Task.h>
#include <folly/fibers/FiberManager.h>
#include <folly/futures/Future.h>
#include <thrift/lib/cpp/TApplicationException.h>
Expand Down
2 changes: 1 addition & 1 deletion third-party/thrift/src/thrift/lib/cpp2/gen/service_h.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <unordered_set>

#include <folly/Portability.h>
#include <folly/experimental/coro/Task.h>
#include <folly/coro/Task.h>
#include <folly/futures/Future.h>
#include <thrift/lib/cpp/TApplicationException.h>
#include <thrift/lib/cpp/protocol/TProtocolTypes.h>
Expand Down
8 changes: 4 additions & 4 deletions third-party/thrift/src/thrift/lib/cpp2/server/PerturbSource.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@

#include <chrono>

#include <folly/experimental/coro/AsyncScope.h>
#include <folly/experimental/coro/BlockingWait.h>
#include <folly/experimental/coro/Sleep.h>
#include <folly/experimental/coro/Task.h>
#include <folly/coro/AsyncScope.h>
#include <folly/coro/BlockingWait.h>
#include <folly/coro/Sleep.h>
#include <folly/coro/Task.h>

#if FOLLY_HAS_COROUTINES

Expand Down
2 changes: 1 addition & 1 deletion third-party/thrift/src/thrift/lib/cpp2/server/PolledServiceHealth.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <cstdint>

#include <folly/Portability.h>
#include <folly/experimental/coro/Task.h>
#include <folly/coro/Task.h>

#include <thrift/lib/cpp2/async/AsyncProcessor.h>

Expand Down
Loading

0 comments on commit 4126978

Please sign in to comment.