Skip to content

Commit

Permalink
Deshim coro in fbcode/fboss
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.fboss
Autodiff bookmark: ad.dcoro.fbcode.fboss

Reviewed By: dtolnay

Differential Revision: D62684455

fbshipit-source-id: 3d36a8f23a444958c7d0689a0a152a96ce08cac8
  • Loading branch information
@Gownta @facebook-github-bot
Gownta authored and facebook-github-bot committed Sep 14, 2024
1 parent 3a2d913 commit 46f62e5
Show file tree
Hide file tree
Showing 41 changed files with 87 additions and 87 deletions.
8 changes: 4 additions & 4 deletions fboss/agent/BUCK
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1434,10 +1434,10 @@ cpp_library(
"//folly:cancellation_token",
"//folly:network_address",
"//folly:synchronized",
"//folly/experimental/coro:async_scope",
"//folly/experimental/coro:blocking_wait",
"//folly/experimental/coro:bounded_queue",
"//folly/experimental/coro:unbounded_queue",
"//folly/coro:async_scope",
"//folly/coro:blocking_wait",
"//folly/coro:bounded_queue",
"//folly/coro:unbounded_queue",
"//folly/io/async:async_base",
"//folly/io/async:scoped_event_base_thread",
"//thrift/lib/cpp2/async:pooled_request_channel",
Expand Down
2 changes: 1 addition & 1 deletion fboss/agent/mnpu/FdbEventSyncer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/
#include "fboss/agent/mnpu/FdbEventSyncer.h"
#if FOLLY_HAS_COROUTINES
#include <folly/experimental/coro/BlockingWait.h>
#include <folly/coro/BlockingWait.h>
#endif

namespace facebook::fboss {
Expand Down
2 changes: 1 addition & 1 deletion fboss/agent/mnpu/HwSwitchStatsSinkClient.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/
#include "fboss/agent/mnpu/HwSwitchStatsSinkClient.h"
#if FOLLY_HAS_COROUTINES
#include <folly/experimental/coro/BlockingWait.h>
#include <folly/coro/BlockingWait.h>
#endif

namespace facebook::fboss {
Expand Down
2 changes: 1 addition & 1 deletion fboss/agent/mnpu/LinkChangeEventSyncer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "fboss/agent/mnpu/LinkChangeEventSyncer.h"
#include "fboss/agent/HwSwitch.h"
#if FOLLY_HAS_COROUTINES
#include <folly/experimental/coro/BlockingWait.h>
#include <folly/coro/BlockingWait.h>
#endif

namespace facebook::fboss {
Expand Down
2 changes: 1 addition & 1 deletion fboss/agent/mnpu/RxPktEventSyncer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/
#include "fboss/agent/mnpu/RxPktEventSyncer.h"
#if FOLLY_HAS_COROUTINES
#include <folly/experimental/coro/BlockingWait.h>
#include <folly/coro/BlockingWait.h>
#endif

namespace facebook::fboss {
Expand Down
8 changes: 4 additions & 4 deletions fboss/agent/mnpu/SplitAgentThriftSyncerClient.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
#include <string>

#if FOLLY_HAS_COROUTINES
#include <folly/experimental/coro/AsyncScope.h>
#include <folly/experimental/coro/BlockingWait.h>
#include <folly/experimental/coro/BoundedQueue.h>
#include <folly/experimental/coro/UnboundedQueue.h>
#include <folly/coro/AsyncScope.h>
#include <folly/coro/BlockingWait.h>
#include <folly/coro/BoundedQueue.h>
#include <folly/coro/UnboundedQueue.h>
#endif

#include "fboss/agent/MultiSwitchThriftHandler.h"
Expand Down
2 changes: 1 addition & 1 deletion fboss/agent/mnpu/SwitchReachabilityChangeEventSyncer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "fboss/agent/mnpu/SwitchReachabilityChangeEventSyncer.h"
#include "fboss/agent/HwSwitch.h"
#if FOLLY_HAS_COROUTINES
#include <folly/experimental/coro/BlockingWait.h>
#include <folly/coro/BlockingWait.h>
#endif

namespace facebook::fboss {
Expand Down
2 changes: 1 addition & 1 deletion fboss/agent/mnpu/TxPktEventSyncer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "fboss/agent/TxPacket.h"

#if FOLLY_HAS_COROUTINES
#include <folly/experimental/coro/BlockingWait.h>
#include <folly/coro/BlockingWait.h>
#endif

DEFINE_int32(tx_pkt_stream_buffer_size, 1000, "TxPktEventStream buffer size");
Expand Down
6 changes: 3 additions & 3 deletions fboss/agent/test/BUCK
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,11 @@ cpp_unittest(
"//folly:move_wrapper",
"//folly:network_address",
"//folly:string",
"//folly/coro:gtest_helpers",
"//folly/coro:timeout",
"//folly/coro:unbounded_queue",
"//folly/executors:io_thread_pool_executor",
"//folly/executors/thread_factory:named_thread_factory",
"//folly/experimental/coro:gtest_helpers",
"//folly/experimental/coro:timeout",
"//folly/experimental/coro:unbounded_queue",
"//folly/io:iobuf",
"//folly/logging:logging",
"//folly/portability:gtest",
Expand Down
6 changes: 3 additions & 3 deletions fboss/agent/test/ThriftServerTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
#include <thrift/lib/cpp/util/EnumUtils.h>
#include "fboss/agent/test/MultiSwitchTestServer.h"

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

Expand Down
2 changes: 1 addition & 1 deletion fboss/agent/thrift_packet_stream/BUCK
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ cpp_library(
"//fboss/agent/if:packet_stream-cpp2-clients",
"//folly:cancellation_token",
"//folly:synchronized",
"//folly/experimental/coro:blocking_wait",
"//folly/coro:blocking_wait",
"//folly/io/async:async_socket",
"//folly/io/async:scoped_event_base_thread",
"//folly/logging:logging",
Expand Down
2 changes: 1 addition & 1 deletion fboss/agent/thrift_packet_stream/PacketStreamClient.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include <fboss/agent/if/gen-cpp2/PacketStreamAsyncClient.h>
#if FOLLY_HAS_COROUTINES
#include <folly/experimental/coro/BlockingWait.h>
#include <folly/coro/BlockingWait.h>
#endif
#include <folly/Synchronized.h>
#include <folly/io/async/ScopedEventBaseThread.h>
Expand Down
6 changes: 3 additions & 3 deletions fboss/fsdb/client/BUCK
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ cpp_library(
"//fboss/fsdb/if:fsdb_oper-cpp2-types",
"//fboss/lib:common_thrift_utils",
"//folly:network_address",
"//folly/experimental/coro:async_scope",
"//folly/coro:async_scope",
"//folly/io/async:async_socket_transport",
"//folly/io/async:scoped_event_base_thread",
"//folly/logging:logging",
Expand Down Expand Up @@ -62,8 +62,8 @@ cpp_library(
"//folly:string",
"//folly:synchronized",
"//folly/concurrency:dynamic_bounded_queue",
"//folly/experimental/coro:async_generator",
"//folly/experimental/coro:async_pipe",
"//folly/coro:async_generator",
"//folly/coro:async_pipe",
"//folly/io/async:scoped_event_base_thread",
"//folly/logging:logging",
],
Expand Down
4 changes: 2 additions & 2 deletions fboss/fsdb/client/FsdbPublisher.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#include <folly/Format.h>
#include <folly/String.h>
#include <folly/concurrency/DynamicBoundedQueue.h>
#include <folly/experimental/coro/AsyncGenerator.h>
#include <folly/experimental/coro/AsyncPipe.h>
#include <folly/coro/AsyncGenerator.h>
#include <folly/coro/AsyncPipe.h>
#include "fboss/fsdb/client/FsdbStreamClient.h"
#include "fboss/fsdb/if/gen-cpp2/fsdb_oper_types.h"

Expand Down
2 changes: 1 addition & 1 deletion fboss/fsdb/client/FsdbStreamClient.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include <fb303/ThreadCachedServiceData.h>
#include <folly/SocketAddress.h>
#include <folly/experimental/coro/AsyncScope.h>
#include <folly/coro/AsyncScope.h>
#include <folly/io/async/AsyncSocketTransport.h>
#include <folly/io/async/ScopedEventBaseThread.h>
#include <folly/synchronization/Baton.h>
Expand Down
2 changes: 1 addition & 1 deletion fboss/fsdb/client/FsdbSubscriber.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

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

#include <folly/logging/xlog.h>

Expand Down
4 changes: 2 additions & 2 deletions fboss/fsdb/client/test/BUCK
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ cpp_unittest(
"//fboss/fsdb/client:fsdb_stream_client",
"//fboss/fsdb/common:flags",
"//fboss/lib:common_utils",
"//folly/experimental/coro:async_generator",
"//folly/experimental/coro:async_pipe",
"//folly/coro:async_generator",
"//folly/coro:async_pipe",
"//folly/io/async:scoped_event_base_thread",
"//folly/logging:logging",
],
Expand Down
4 changes: 2 additions & 2 deletions fboss/fsdb/client/test/FsdbPubSubManagerTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#include "fboss/fsdb/common/Flags.h"
#include "fboss/lib/CommonUtils.h"

#include <folly/experimental/coro/AsyncGenerator.h>
#include <folly/experimental/coro/AsyncPipe.h>
#include <folly/coro/AsyncGenerator.h>
#include <folly/coro/AsyncPipe.h>
#include <folly/io/async/ScopedEventBaseThread.h>
#include <folly/logging/xlog.h>

Expand Down
4 changes: 2 additions & 2 deletions fboss/fsdb/client/test/FsdbPublisherTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#include "fboss/fsdb/common/Flags.h"
#include "fboss/lib/CommonUtils.h"

#include <folly/experimental/coro/AsyncGenerator.h>
#include <folly/experimental/coro/AsyncPipe.h>
#include <folly/coro/AsyncGenerator.h>
#include <folly/coro/AsyncPipe.h>
#include <folly/io/async/ScopedEventBaseThread.h>
#include <folly/logging/xlog.h>
#include <gtest/gtest.h>
Expand Down
4 changes: 2 additions & 2 deletions fboss/fsdb/client/test/FsdbStreamClientTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#include "fboss/lib/CommonUtils.h"

#include <fb303/ServiceData.h>
#include <folly/experimental/coro/AsyncGenerator.h>
#include <folly/experimental/coro/AsyncPipe.h>
#include <folly/coro/AsyncGenerator.h>
#include <folly/coro/AsyncPipe.h>
#include <folly/io/async/ScopedEventBaseThread.h>
#include <folly/logging/xlog.h>
#include <algorithm>
Expand Down
20 changes: 10 additions & 10 deletions fboss/fsdb/oper/BUCK
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ cpp_library(
"//folly:string",
"//folly:traits",
"//folly/container:f14_hash",
"//folly/experimental/coro:async_pipe",
"//folly/experimental/coro:async_scope",
"//folly/experimental/coro:blocking_wait",
"//folly/experimental/coro:sleep",
"//folly/coro:async_pipe",
"//folly/coro:async_scope",
"//folly/coro:blocking_wait",
"//folly/coro:sleep",
"//folly/io/async:async_base",
"//folly/json:dynamic",
"//folly/logging:logging",
Expand Down Expand Up @@ -89,10 +89,10 @@ cpp_library(
"//fboss/thrift_cow/storage:storage",
"//folly:expected",
"//folly:synchronized",
"//folly/experimental/coro:async_generator",
"//folly/experimental/coro:async_scope",
"//folly/experimental/coro:blocking_wait",
"//folly/experimental/coro:sleep",
"//folly/coro:async_generator",
"//folly/coro:async_scope",
"//folly/coro:blocking_wait",
"//folly/coro:sleep",
"//folly/io/async:async_base",
"//folly/io/async:scoped_event_base_thread",
"//folly/json:dynamic",
Expand Down Expand Up @@ -147,8 +147,8 @@ cpp_binary(
"//fboss/thrift_cow/nodes:serializer",
"//folly:file_util",
"//folly:string",
"//folly/experimental/coro:blocking_wait",
"//folly/experimental/coro:task",
"//folly/coro:blocking_wait",
"//folly/coro:task",
"//folly/init:init",
"//servicerouter/client/cpp2:cpp2",
],
Expand Down
2 changes: 1 addition & 1 deletion fboss/fsdb/oper/NaivePeriodicSubscribableStorage.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <fboss/thrift_cow/storage/Storage.h>

#include <folly/Expected.h>
#include <folly/experimental/coro/Sleep.h>
#include <folly/coro/Sleep.h>
#include <thrift/lib/cpp2/protocol/Serializer.h>
#include <chrono>
#include <utility>
Expand Down
2 changes: 1 addition & 1 deletion fboss/fsdb/oper/NaivePeriodicSubscribableStorageBase.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "fboss/fsdb/oper/NaivePeriodicSubscribableStorageBase.h"

#include <fb303/ThreadCachedServiceData.h>
#include <folly/experimental/coro/BlockingWait.h>
#include <folly/coro/BlockingWait.h>
#include <folly/system/ThreadName.h>

#ifndef IS_OSS
Expand Down
2 changes: 1 addition & 1 deletion fboss/fsdb/oper/NaivePeriodicSubscribableStorageBase.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "fboss/thrift_cow/gen-cpp2/patch_types.h"

#include <folly/Synchronized.h>
#include <folly/experimental/coro/AsyncScope.h>
#include <folly/coro/AsyncScope.h>
#include <folly/io/async/EventBase.h>
#include <folly/io/async/ScopedEventBaseThread.h>

Expand Down
4 changes: 2 additions & 2 deletions fboss/fsdb/oper/SubscribableStorage.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#include <fboss/fsdb/oper/DeltaValue.h>
#include <fboss/thrift_cow/storage/Storage.h>
#include <folly/Expected.h>
#include <folly/experimental/coro/AsyncGenerator.h>
#include <folly/experimental/coro/Sleep.h>
#include <folly/coro/AsyncGenerator.h>
#include <folly/coro/Sleep.h>
#include <folly/json/dynamic.h>
#include <folly/logging/xlog.h>
#include <chrono>
Expand Down
4 changes: 2 additions & 2 deletions fboss/fsdb/oper/Subscription.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#include "fboss/fsdb/oper/Subscription.h"

#include <boost/core/noncopyable.hpp>
#include <folly/experimental/coro/BlockingWait.h>
#include <folly/experimental/coro/Sleep.h>
#include <folly/coro/BlockingWait.h>
#include <folly/coro/Sleep.h>
#include <optional>

namespace facebook::fboss::fsdb {
Expand Down
4 changes: 2 additions & 2 deletions fboss/fsdb/oper/Subscription.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
#include "fboss/thrift_cow/gen-cpp2/patch_types.h"

#include <boost/core/noncopyable.hpp>
#include <folly/experimental/coro/AsyncPipe.h>
#include <folly/experimental/coro/AsyncScope.h>
#include <folly/coro/AsyncPipe.h>
#include <folly/coro/AsyncScope.h>
#include <folly/io/async/EventBase.h>
#include <folly/json/dynamic.h>

Expand Down
4 changes: 2 additions & 2 deletions fboss/fsdb/oper/test_client.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

#include <folly/FileUtil.h>
#include <folly/String.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/init/Init.h>
#include "fboss/fsdb/if/FsdbModel.h"
#include "fboss/fsdb/if/gen-cpp2/FsdbService.h"
Expand Down
16 changes: 8 additions & 8 deletions fboss/fsdb/oper/tests/BUCK
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ cpp_unittest(
],
deps = [
"//fboss/fsdb/oper:subscription_manager",
"//folly/experimental/coro:blocking_wait",
"//folly/experimental/coro:timeout",
"//folly/coro:blocking_wait",
"//folly/coro:timeout",
"//folly/io/async:scoped_event_base_thread",
],
)
Expand All @@ -33,12 +33,12 @@ cpp_unittest(
"//fboss/lib:common_utils",
"//fboss/thrift_cow/visitors:visitors",
"//folly:random",
"//folly/experimental/coro:async_generator",
"//folly/experimental/coro:blocking_wait",
"//folly/experimental/coro:collect",
"//folly/experimental/coro:gtest_helpers",
"//folly/experimental/coro:task",
"//folly/experimental/coro:timeout",
"//folly/coro:async_generator",
"//folly/coro:blocking_wait",
"//folly/coro:collect",
"//folly/coro:gtest_helpers",
"//folly/coro:task",
"//folly/coro:timeout",
"//folly/json:dynamic",
"//thrift/lib/cpp2/folly_dynamic:folly_dynamic",
],
Expand Down
12 changes: 6 additions & 6 deletions fboss/fsdb/oper/tests/SubscribableStorageTests.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
#include <fboss/lib/CommonUtils.h>
#include <fboss/thrift_cow/visitors/PatchBuilder.h>
#include <folly/Random.h>
#include <folly/experimental/coro/AsyncGenerator.h>
#include <folly/experimental/coro/BlockingWait.h>
#include <folly/experimental/coro/Collect.h>
#include <folly/experimental/coro/GtestHelpers.h>
#include <folly/experimental/coro/Task.h>
#include <folly/experimental/coro/Timeout.h>
#include <folly/coro/AsyncGenerator.h>
#include <folly/coro/BlockingWait.h>
#include <folly/coro/Collect.h>
#include <folly/coro/GtestHelpers.h>
#include <folly/coro/Task.h>
#include <folly/coro/Timeout.h>
#include <thrift/lib/cpp2/folly_dynamic/folly_dynamic.h>
#include "fboss/fsdb/oper/ExtendedPathBuilder.h"
#include "fboss/fsdb/tests/gen-cpp2-thriftpath/thriftpath_test.h" // @manual=//fboss/fsdb/tests:thriftpath_test_thrift-cpp2-thriftpath
Expand Down
4 changes: 2 additions & 2 deletions fboss/fsdb/oper/tests/SubscriptionTests.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#include <fboss/fsdb/oper/Subscription.h>

#include <folly/experimental/coro/BlockingWait.h>
#include <folly/experimental/coro/Timeout.h>
#include <folly/coro/BlockingWait.h>
#include <folly/coro/Timeout.h>
#include <folly/io/async/ScopedEventBaseThread.h>
#include <gtest/gtest.h>

Expand Down
Loading

0 comments on commit 46f62e5

Please sign in to comment.