From f2ac9a5cbd5086032a376bd93fcf23ad1af62ee3 Mon Sep 17 00:00:00 2001 From: James Sedgwick Date: Tue, 16 Dec 2014 10:26:24 -0800 Subject: [PATCH] codemod: folly/wangle/ -> folly/wangle/futures Summary: Last thing before moving experimental/wangle here. Once everything is in the same directory I'm probably going to consolidate experimental/wangle/concurrent with the executors in this directory into wangle/executors/. And probably rename some of these targets. For now, a dumb move is enough. Test Plan: waiting for contbuild Reviewed By: davejwatson@fb.com Subscribers: trunkagent, fbcode-common-diffs@, chaoyc, search-fbcode-diffs@, lars, ruibalp, hero-diffs@, zeus-diffs@, vikas, danielg, mcduff, cold-storage-diffs@, unicorn-diffs@, ldbrandy, targeting-diff-backend@, netego-diffs@, fugalh, adamsyta, atlas2-eng@, alandau, bmatheny, adityab, everstore-dev@, zhuohuang, sweeney, mwa, jgehring, smarlow, akr, bnitka, jcoens, luk, zhguo, jying, apodsiadlo, alikhtarov, fuegen, dzhulgakov, mshneer, folly-diffs@, wch, tingy, hannesr FB internal diff: D1740327 Tasks: 5802833 Signature: t1:1740327:1418752541:82d7486293b0a12938730ae66d480c120aded4dc --- folly/Makefile.am | 34 +++++++++---------- .../wangle/channel/ChannelHandler.h | 2 +- .../wangle/channel/ChannelHandlerContext.h | 2 +- .../wangle/channel/ChannelPipeline.h | 2 +- .../wangle/concurrent/FutureExecutor.h | 2 +- folly/wangle/{ => futures}/Deprecated.h | 0 folly/wangle/{ => futures}/Future-inl.h | 2 +- folly/wangle/{ => futures}/Future.h | 6 ++-- folly/wangle/{ => futures}/InlineExecutor.cpp | 0 folly/wangle/{ => futures}/InlineExecutor.h | 0 folly/wangle/{ => futures}/ManualExecutor.cpp | 2 +- folly/wangle/{ => futures}/ManualExecutor.h | 2 +- .../{ => futures}/OpaqueCallbackShunt.h | 2 +- folly/wangle/{ => futures}/Promise-inl.h | 4 +-- folly/wangle/{ => futures}/Promise.h | 6 ++-- .../{ => futures}/QueuedImmediateExecutor.cpp | 2 +- .../{ => futures}/QueuedImmediateExecutor.h | 0 folly/wangle/{ => futures}/README.md | 2 +- .../wangle/{ => futures}/ScheduledExecutor.h | 0 folly/wangle/{ => futures}/Try-inl.h | 2 +- folly/wangle/{ => futures}/Try.h | 4 +-- folly/wangle/{ => futures}/WangleException.h | 0 folly/wangle/{ => futures}/detail/Core.h | 8 ++--- folly/wangle/{ => futures}/detail/Dummy.cpp | 0 folly/wangle/{ => futures}/detail/FSM.h | 0 folly/wangle/{ => futures}/test/Benchmark.cpp | 4 +-- .../{ => futures}/test/ClientCompile.cpp | 6 ++-- .../{ => futures}/test/ExecutorTest.cpp | 8 ++--- folly/wangle/{ => futures}/test/FSM.cpp | 2 +- .../wangle/{ => futures}/test/FutureTest.cpp | 4 +-- .../wangle/{ => futures}/test/Interrupts.cpp | 4 +-- folly/wangle/{ => futures}/test/Thens.cpp | 2 +- folly/wangle/{ => futures}/test/Thens.h | 2 +- folly/wangle/{ => futures}/test/Try.cpp | 2 +- folly/wangle/{ => futures}/test/ViaTest.cpp | 6 ++-- folly/wangle/{ => futures}/test/main.cpp | 0 folly/wangle/{ => futures}/test/thens.rb | 2 +- 37 files changed, 63 insertions(+), 63 deletions(-) rename folly/wangle/{ => futures}/Deprecated.h (100%) rename folly/wangle/{ => futures}/Future-inl.h (99%) rename folly/wangle/{ => futures}/Future.h (99%) rename folly/wangle/{ => futures}/InlineExecutor.cpp (100%) rename folly/wangle/{ => futures}/InlineExecutor.h (100%) rename folly/wangle/{ => futures}/ManualExecutor.cpp (97%) rename folly/wangle/{ => futures}/ManualExecutor.h (98%) rename folly/wangle/{ => futures}/OpaqueCallbackShunt.h (97%) rename folly/wangle/{ => futures}/Promise-inl.h (96%) rename folly/wangle/{ => futures}/Promise.h (95%) rename folly/wangle/{ => futures}/QueuedImmediateExecutor.cpp (94%) rename folly/wangle/{ => futures}/QueuedImmediateExecutor.h (100%) rename folly/wangle/{ => futures}/README.md (99%) rename folly/wangle/{ => futures}/ScheduledExecutor.h (100%) rename folly/wangle/{ => futures}/Try-inl.h (98%) rename folly/wangle/{ => futures}/Try.h (97%) rename folly/wangle/{ => futures}/WangleException.h (100%) rename folly/wangle/{ => futures}/detail/Core.h (97%) rename folly/wangle/{ => futures}/detail/Dummy.cpp (100%) rename folly/wangle/{ => futures}/detail/FSM.h (100%) rename folly/wangle/{ => futures}/test/Benchmark.cpp (98%) rename folly/wangle/{ => futures}/test/ClientCompile.cpp (85%) rename folly/wangle/{ => futures}/test/ExecutorTest.cpp (94%) rename folly/wangle/{ => futures}/test/FSM.cpp (98%) rename folly/wangle/{ => futures}/test/FutureTest.cpp (99%) rename folly/wangle/{ => futures}/test/Interrupts.cpp (95%) rename folly/wangle/{ => futures}/test/Thens.cpp (97%) rename folly/wangle/{ => futures}/test/Thens.h (98%) rename folly/wangle/{ => futures}/test/Try.cpp (97%) rename folly/wangle/{ => futures}/test/ViaTest.cpp (97%) rename folly/wangle/{ => futures}/test/main.cpp (100%) rename folly/wangle/{ => futures}/test/thens.rb (97%) diff --git a/folly/Makefile.am b/folly/Makefile.am index 2da84595..74bbb43f 100644 --- a/folly/Makefile.am +++ b/folly/Makefile.am @@ -237,21 +237,21 @@ nobase_follyinclude_HEADERS = \ Uri-inl.h \ Varint.h \ VersionCheck.h \ - wangle/Deprecated.h \ - wangle/Future-inl.h \ - wangle/Future.h \ - wangle/InlineExecutor.h \ - wangle/ManualExecutor.h \ - wangle/OpaqueCallbackShunt.h \ - wangle/Promise-inl.h \ - wangle/Promise.h \ - wangle/QueuedImmediateExecutor.h \ - wangle/ScheduledExecutor.h \ - wangle/Try-inl.h \ - wangle/Try.h \ - wangle/WangleException.h \ - wangle/detail/Core.h \ - wangle/detail/FSM.h + wangle/futures/Deprecated.h \ + wangle/futures/Future-inl.h \ + wangle/futures/Future.h \ + wangle/futures/InlineExecutor.h \ + wangle/futures/ManualExecutor.h \ + wangle/futures/OpaqueCallbackShunt.h \ + wangle/futures/Promise-inl.h \ + wangle/futures/Promise.h \ + wangle/futures/QueuedImmediateExecutor.h \ + wangle/futures/ScheduledExecutor.h \ + wangle/futures/Try-inl.h \ + wangle/futures/Try.h \ + wangle/futures/WangleException.h \ + wangle/futures/detail/Core.h \ + wangle/futures/detail/FSM.h FormatTables.cpp: build/generate_format_tables.py build/generate_format_tables.py @@ -323,8 +323,8 @@ libfolly_la_SOURCES = \ TimeoutQueue.cpp \ Uri.cpp \ Version.cpp \ - wangle/InlineExecutor.cpp \ - wangle/ManualExecutor.cpp \ + wangle/futures/InlineExecutor.cpp \ + wangle/futures/ManualExecutor.cpp \ experimental/io/FsUtil.cpp \ experimental/Singleton.cpp \ experimental/TestUtil.cpp \ diff --git a/folly/experimental/wangle/channel/ChannelHandler.h b/folly/experimental/wangle/channel/ChannelHandler.h index 27a32447..e7fd3135 100644 --- a/folly/experimental/wangle/channel/ChannelHandler.h +++ b/folly/experimental/wangle/channel/ChannelHandler.h @@ -16,7 +16,7 @@ #pragma once -#include +#include #include #include #include diff --git a/folly/experimental/wangle/channel/ChannelHandlerContext.h b/folly/experimental/wangle/channel/ChannelHandlerContext.h index baf413ff..59ea3ae4 100644 --- a/folly/experimental/wangle/channel/ChannelHandlerContext.h +++ b/folly/experimental/wangle/channel/ChannelHandlerContext.h @@ -17,7 +17,7 @@ #pragma once #include -#include +#include #include namespace folly { namespace wangle { diff --git a/folly/experimental/wangle/channel/ChannelPipeline.h b/folly/experimental/wangle/channel/ChannelPipeline.h index ea7959bc..386caec3 100644 --- a/folly/experimental/wangle/channel/ChannelPipeline.h +++ b/folly/experimental/wangle/channel/ChannelPipeline.h @@ -17,7 +17,7 @@ #pragma once #include -#include +#include #include #include #include diff --git a/folly/experimental/wangle/concurrent/FutureExecutor.h b/folly/experimental/wangle/concurrent/FutureExecutor.h index ecf392b7..8aeedff8 100644 --- a/folly/experimental/wangle/concurrent/FutureExecutor.h +++ b/folly/experimental/wangle/concurrent/FutureExecutor.h @@ -15,7 +15,7 @@ */ #pragma once -#include +#include namespace folly { namespace wangle { diff --git a/folly/wangle/Deprecated.h b/folly/wangle/futures/Deprecated.h similarity index 100% rename from folly/wangle/Deprecated.h rename to folly/wangle/futures/Deprecated.h diff --git a/folly/wangle/Future-inl.h b/folly/wangle/futures/Future-inl.h similarity index 99% rename from folly/wangle/Future-inl.h rename to folly/wangle/futures/Future-inl.h index 2df6fef2..074571db 100644 --- a/folly/wangle/Future-inl.h +++ b/folly/wangle/futures/Future-inl.h @@ -19,7 +19,7 @@ #include #include -#include +#include #include namespace folly { namespace wangle { diff --git a/folly/wangle/Future.h b/folly/wangle/futures/Future.h similarity index 99% rename from folly/wangle/Future.h rename to folly/wangle/futures/Future.h index f124d7b5..cdea93df 100644 --- a/folly/wangle/Future.h +++ b/folly/wangle/futures/Future.h @@ -24,8 +24,8 @@ #include #include -#include -#include +#include +#include namespace folly { namespace wangle { @@ -501,4 +501,4 @@ Future waitWithSemaphore(Future&& f, Duration timeout); }} // folly::wangle -#include +#include diff --git a/folly/wangle/InlineExecutor.cpp b/folly/wangle/futures/InlineExecutor.cpp similarity index 100% rename from folly/wangle/InlineExecutor.cpp rename to folly/wangle/futures/InlineExecutor.cpp diff --git a/folly/wangle/InlineExecutor.h b/folly/wangle/futures/InlineExecutor.h similarity index 100% rename from folly/wangle/InlineExecutor.h rename to folly/wangle/futures/InlineExecutor.h diff --git a/folly/wangle/ManualExecutor.cpp b/folly/wangle/futures/ManualExecutor.cpp similarity index 97% rename from folly/wangle/ManualExecutor.cpp rename to folly/wangle/futures/ManualExecutor.cpp index 4a2ee3a3..9b68b1a1 100644 --- a/folly/wangle/ManualExecutor.cpp +++ b/folly/wangle/futures/ManualExecutor.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include #include diff --git a/folly/wangle/ManualExecutor.h b/folly/wangle/futures/ManualExecutor.h similarity index 98% rename from folly/wangle/ManualExecutor.h rename to folly/wangle/futures/ManualExecutor.h index 329f9fc6..72a1c1d2 100644 --- a/folly/wangle/ManualExecutor.h +++ b/folly/wangle/futures/ManualExecutor.h @@ -15,7 +15,7 @@ */ #pragma once -#include +#include #include #include #include diff --git a/folly/wangle/OpaqueCallbackShunt.h b/folly/wangle/futures/OpaqueCallbackShunt.h similarity index 97% rename from folly/wangle/OpaqueCallbackShunt.h rename to folly/wangle/futures/OpaqueCallbackShunt.h index 6cd325ec..2e7dbd16 100644 --- a/folly/wangle/OpaqueCallbackShunt.h +++ b/folly/wangle/futures/OpaqueCallbackShunt.h @@ -16,7 +16,7 @@ #pragma once -#include +#include namespace folly { namespace wangle { diff --git a/folly/wangle/Promise-inl.h b/folly/wangle/futures/Promise-inl.h similarity index 96% rename from folly/wangle/Promise-inl.h rename to folly/wangle/futures/Promise-inl.h index 68d69641..ec1afe17 100644 --- a/folly/wangle/Promise-inl.h +++ b/folly/wangle/futures/Promise-inl.h @@ -19,8 +19,8 @@ #include #include -#include -#include +#include +#include namespace folly { namespace wangle { diff --git a/folly/wangle/Promise.h b/folly/wangle/futures/Promise.h similarity index 95% rename from folly/wangle/Promise.h rename to folly/wangle/futures/Promise.h index 7442e451..31b76cfe 100644 --- a/folly/wangle/Promise.h +++ b/folly/wangle/futures/Promise.h @@ -16,7 +16,7 @@ #pragma once -#include +#include namespace folly { namespace wangle { @@ -97,5 +97,5 @@ private: }} -#include -#include +#include +#include diff --git a/folly/wangle/QueuedImmediateExecutor.cpp b/folly/wangle/futures/QueuedImmediateExecutor.cpp similarity index 94% rename from folly/wangle/QueuedImmediateExecutor.cpp rename to folly/wangle/futures/QueuedImmediateExecutor.cpp index 739ba5ef..b82a486e 100644 --- a/folly/wangle/QueuedImmediateExecutor.cpp +++ b/folly/wangle/futures/QueuedImmediateExecutor.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include #include diff --git a/folly/wangle/QueuedImmediateExecutor.h b/folly/wangle/futures/QueuedImmediateExecutor.h similarity index 100% rename from folly/wangle/QueuedImmediateExecutor.h rename to folly/wangle/futures/QueuedImmediateExecutor.h diff --git a/folly/wangle/README.md b/folly/wangle/futures/README.md similarity index 99% rename from folly/wangle/README.md rename to folly/wangle/futures/README.md index cb88fe36..a23d7c6e 100644 --- a/folly/wangle/README.md +++ b/folly/wangle/futures/README.md @@ -18,7 +18,7 @@ The primary semantic differences are that Wangle Futures and Promises are not th ## Brief Synopsis ```C++ -#include +#include using namespace folly::wangle; using namespace std; diff --git a/folly/wangle/ScheduledExecutor.h b/folly/wangle/futures/ScheduledExecutor.h similarity index 100% rename from folly/wangle/ScheduledExecutor.h rename to folly/wangle/futures/ScheduledExecutor.h diff --git a/folly/wangle/Try-inl.h b/folly/wangle/futures/Try-inl.h similarity index 98% rename from folly/wangle/Try-inl.h rename to folly/wangle/futures/Try-inl.h index 935f54bc..44f2cea4 100644 --- a/folly/wangle/Try-inl.h +++ b/folly/wangle/futures/Try-inl.h @@ -18,7 +18,7 @@ #include -#include +#include namespace folly { namespace wangle { diff --git a/folly/wangle/Try.h b/folly/wangle/futures/Try.h similarity index 97% rename from folly/wangle/Try.h rename to folly/wangle/futures/Try.h index bc7800d8..a90aa4d5 100644 --- a/folly/wangle/Try.h +++ b/folly/wangle/futures/Try.h @@ -20,7 +20,7 @@ #include #include #include -#include +#include namespace folly { namespace wangle { @@ -143,4 +143,4 @@ makeTryFunction(F&& f); }} -#include +#include diff --git a/folly/wangle/WangleException.h b/folly/wangle/futures/WangleException.h similarity index 100% rename from folly/wangle/WangleException.h rename to folly/wangle/futures/WangleException.h diff --git a/folly/wangle/detail/Core.h b/folly/wangle/futures/detail/Core.h similarity index 97% rename from folly/wangle/detail/Core.h rename to folly/wangle/futures/detail/Core.h index 933cd7ad..cd9e5af5 100644 --- a/folly/wangle/detail/Core.h +++ b/folly/wangle/futures/detail/Core.h @@ -24,11 +24,11 @@ #include #include -#include -#include -#include +#include +#include +#include #include -#include +#include #include diff --git a/folly/wangle/detail/Dummy.cpp b/folly/wangle/futures/detail/Dummy.cpp similarity index 100% rename from folly/wangle/detail/Dummy.cpp rename to folly/wangle/futures/detail/Dummy.cpp diff --git a/folly/wangle/detail/FSM.h b/folly/wangle/futures/detail/FSM.h similarity index 100% rename from folly/wangle/detail/FSM.h rename to folly/wangle/futures/detail/FSM.h diff --git a/folly/wangle/test/Benchmark.cpp b/folly/wangle/futures/test/Benchmark.cpp similarity index 98% rename from folly/wangle/test/Benchmark.cpp rename to folly/wangle/futures/test/Benchmark.cpp index 95fcef9f..863fa95e 100644 --- a/folly/wangle/test/Benchmark.cpp +++ b/folly/wangle/futures/test/Benchmark.cpp @@ -17,8 +17,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/folly/wangle/test/ClientCompile.cpp b/folly/wangle/futures/test/ClientCompile.cpp similarity index 85% rename from folly/wangle/test/ClientCompile.cpp rename to folly/wangle/futures/test/ClientCompile.cpp index 45ad8cd4..ab18d12e 100644 --- a/folly/wangle/test/ClientCompile.cpp +++ b/folly/wangle/futures/test/ClientCompile.cpp @@ -16,7 +16,7 @@ // amazing what things can go wrong if you include things in an unexpected // order. -#include -#include -#include +#include +#include +#include int main() { return 0; } diff --git a/folly/wangle/test/ExecutorTest.cpp b/folly/wangle/futures/test/ExecutorTest.cpp similarity index 94% rename from folly/wangle/test/ExecutorTest.cpp rename to folly/wangle/futures/test/ExecutorTest.cpp index b4ec7684..67f43ec5 100644 --- a/folly/wangle/test/ExecutorTest.cpp +++ b/folly/wangle/futures/test/ExecutorTest.cpp @@ -15,10 +15,10 @@ */ #include -#include -#include -#include -#include +#include +#include +#include +#include #include using namespace folly::wangle; diff --git a/folly/wangle/test/FSM.cpp b/folly/wangle/futures/test/FSM.cpp similarity index 98% rename from folly/wangle/test/FSM.cpp rename to folly/wangle/futures/test/FSM.cpp index 80ee5364..ff75f868 100644 --- a/folly/wangle/test/FSM.cpp +++ b/folly/wangle/futures/test/FSM.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include using namespace folly::wangle::detail; diff --git a/folly/wangle/test/FutureTest.cpp b/folly/wangle/futures/test/FutureTest.cpp similarity index 99% rename from folly/wangle/test/FutureTest.cpp rename to folly/wangle/futures/test/FutureTest.cpp index d6cfbfbc..fedd7a35 100644 --- a/folly/wangle/test/FutureTest.cpp +++ b/folly/wangle/futures/test/FutureTest.cpp @@ -25,8 +25,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/folly/wangle/test/Interrupts.cpp b/folly/wangle/futures/test/Interrupts.cpp similarity index 95% rename from folly/wangle/test/Interrupts.cpp rename to folly/wangle/futures/test/Interrupts.cpp index 41d5bf7d..3ecf050d 100644 --- a/folly/wangle/test/Interrupts.cpp +++ b/folly/wangle/futures/test/Interrupts.cpp @@ -16,8 +16,8 @@ #include -#include -#include +#include +#include using namespace folly::wangle; diff --git a/folly/wangle/test/Thens.cpp b/folly/wangle/futures/test/Thens.cpp similarity index 97% rename from folly/wangle/test/Thens.cpp rename to folly/wangle/futures/test/Thens.cpp index e8ac875d..2ebbf486 100644 --- a/folly/wangle/test/Thens.cpp +++ b/folly/wangle/futures/test/Thens.cpp @@ -3,7 +3,7 @@ // TODO: fails to compile with clang:dev. See task #4412111 #ifndef __clang__ -#include +#include TEST(Future, thenVariants) { SomeClass anObject; diff --git a/folly/wangle/test/Thens.h b/folly/wangle/futures/test/Thens.h similarity index 98% rename from folly/wangle/test/Thens.h rename to folly/wangle/futures/test/Thens.h index 928f8205..d0398487 100644 --- a/folly/wangle/test/Thens.h +++ b/folly/wangle/futures/test/Thens.h @@ -17,7 +17,7 @@ #pragma once #include #include -#include +#include #include using namespace folly::wangle; diff --git a/folly/wangle/test/Try.cpp b/folly/wangle/futures/test/Try.cpp similarity index 97% rename from folly/wangle/test/Try.cpp rename to folly/wangle/futures/test/Try.cpp index a472bed6..2c8a6068 100644 --- a/folly/wangle/test/Try.cpp +++ b/folly/wangle/futures/test/Try.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include using namespace folly::wangle; diff --git a/folly/wangle/test/ViaTest.cpp b/folly/wangle/futures/test/ViaTest.cpp similarity index 97% rename from folly/wangle/test/ViaTest.cpp rename to folly/wangle/futures/test/ViaTest.cpp index 3e9953e0..80765ff0 100644 --- a/folly/wangle/test/ViaTest.cpp +++ b/folly/wangle/futures/test/ViaTest.cpp @@ -17,9 +17,9 @@ #include #include -#include -#include -#include +#include +#include +#include using namespace folly::wangle; diff --git a/folly/wangle/test/main.cpp b/folly/wangle/futures/test/main.cpp similarity index 100% rename from folly/wangle/test/main.cpp rename to folly/wangle/futures/test/main.cpp diff --git a/folly/wangle/test/thens.rb b/folly/wangle/futures/test/thens.rb similarity index 97% rename from folly/wangle/test/thens.rb rename to folly/wangle/futures/test/thens.rb index 61ca26de..4aaa8463 100755 --- a/folly/wangle/test/thens.rb +++ b/folly/wangle/futures/test/thens.rb @@ -66,7 +66,7 @@ print < +#include TEST(Future, thenVariants) { SomeClass anObject; -- 2.34.1