From bc374dcbb0e552826e4bcbed1d8cbd479ce062c0 Mon Sep 17 00:00:00 2001 From: James Sedgwick Date: Fri, 9 Jan 2015 08:27:02 -0800 Subject: [PATCH] move wangle/futures to futures Summary: First step of moving futures out of wangle into folly Namespace change will be another diff This was just a straight codemod of "wangle/futures" to "futures" Test Plan: wait for contbuild Reviewed By: davejwatson@fb.com Subscribers: trunkagent, fbcode-common-diffs@, chaoyc, search-fbcode-diffs@, lars, ruibalp, hero-diffs@, zeus-diffs@, vikas, mcduff, hitesh, cold-storage-diffs@, unicorn-diffs@, ldbrandy, targeting-diff-backend@, netego-diffs@, fugalh, adamsyta, atlas2-eng@, alandau, apollo-diffs@, bmatheny, adityab, everstore-dev@, zhuohuang, sweeney, mwa, jgehring, prometheus-diffs@, smarlow, akr, bnitka, jcoens, zhguo, jying, darshan, apodsiadlo, alikhtarov, fuegen, dzhulgakov, alihussains, jeremyfein, mshneer, folly-diffs@, wch, lins, tingy, maxwellsayles, hannesr FB internal diff: D1772041 Tasks: 5960242 Signature: t1:1772041:1420739169:36126b1264c5d1747d241921d02b13e306c73fe1 --- folly/Makefile.am | 46 +++++++++---------- folly/{wangle => }/futures/Deprecated.h | 0 folly/{wangle => }/futures/Future-inl.h | 4 +- folly/{wangle => }/futures/Future.cpp | 4 +- folly/{wangle => }/futures/Future.h | 12 ++--- 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 | 8 ++-- .../futures/QueuedImmediateExecutor.cpp | 2 +- .../futures/QueuedImmediateExecutor.h | 0 folly/{wangle => }/futures/README.md | 2 +- .../{wangle => }/futures/ScheduledExecutor.h | 0 folly/{wangle => }/futures/Timekeeper.h | 4 +- folly/{wangle => }/futures/Try-inl.h | 2 +- folly/{wangle => }/futures/Try.h | 6 +-- folly/{wangle => }/futures/WangleException.h | 0 folly/{wangle => }/futures/detail/Core.h | 8 ++-- folly/{wangle => }/futures/detail/FSM.h | 0 .../futures/detail/ThreadWheelTimekeeper.cpp | 2 +- .../futures/detail/ThreadWheelTimekeeper.h | 4 +- folly/{wangle => }/futures/detail/Types.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 +- .../futures/test/TimekeeperTest.cpp | 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 +- folly/wangle/channel/ChannelHandler.h | 2 +- folly/wangle/channel/ChannelHandlerContext.h | 2 +- folly/wangle/channel/ChannelPipeline.h | 2 +- folly/wangle/concurrent/FutureExecutor.h | 2 +- 42 files changed, 83 insertions(+), 83 deletions(-) rename folly/{wangle => }/futures/Deprecated.h (100%) rename folly/{wangle => }/futures/Future-inl.h (99%) rename folly/{wangle => }/futures/Future.cpp (88%) rename folly/{wangle => }/futures/Future.h (98%) 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 (97%) rename folly/{wangle => }/futures/Promise.h (94%) 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/Timekeeper.h (97%) rename folly/{wangle => }/futures/Try-inl.h (98%) rename folly/{wangle => }/futures/Try.h (98%) rename folly/{wangle => }/futures/WangleException.h (100%) rename folly/{wangle => }/futures/detail/Core.h (97%) rename folly/{wangle => }/futures/detail/FSM.h (100%) rename folly/{wangle => }/futures/detail/ThreadWheelTimekeeper.cpp (98%) rename folly/{wangle => }/futures/detail/ThreadWheelTimekeeper.h (94%) rename folly/{wangle => }/futures/detail/Types.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/TimekeeperTest.cpp (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 50ec57d2..d717d5fd 100644 --- a/folly/Makefile.am +++ b/folly/Makefile.am @@ -84,6 +84,24 @@ nobase_follyinclude_HEADERS = \ FormatArg.h \ Format.h \ Format-inl.h \ + futures/Deprecated.h \ + futures/Future-inl.h \ + futures/Future.h \ + futures/InlineExecutor.h \ + futures/ManualExecutor.h \ + futures/OpaqueCallbackShunt.h \ + futures/Promise-inl.h \ + futures/Promise.h \ + futures/QueuedImmediateExecutor.h \ + futures/ScheduledExecutor.h \ + futures/Timekeeper.h \ + futures/Try-inl.h \ + futures/Try.h \ + futures/WangleException.h \ + futures/detail/Core.h \ + futures/detail/FSM.h \ + futures/detail/ThreadWheelTimekeeper.h \ + futures/detail/Types.h \ gen/Base.h \ gen/Base-inl.h \ gen/Combine.h \ @@ -221,24 +239,6 @@ nobase_follyinclude_HEADERS = \ wangle/concurrent/NamedThreadFactory.h \ wangle/concurrent/ThreadFactory.h \ wangle/concurrent/ThreadPoolExecutor.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/Timekeeper.h \ - wangle/futures/Try-inl.h \ - wangle/futures/Try.h \ - wangle/futures/WangleException.h \ - wangle/futures/detail/Core.h \ - wangle/futures/detail/FSM.h \ - wangle/futures/detail/ThreadWheelTimekeeper.h \ - wangle/futures/detail/Types.h \ wangle/rx/Observable.h \ wangle/rx/Observer.h \ wangle/rx/Subject.h \ @@ -287,6 +287,11 @@ libfolly_la_SOURCES = \ File.cpp \ FileUtil.cpp \ FingerprintTables.cpp \ + futures/detail/ThreadWheelTimekeeper.cpp \ + futures/Future.cpp \ + futures/InlineExecutor.cpp \ + futures/ManualExecutor.cpp \ + futures/QueuedImmediateExecutor.cpp \ detail/Futex.cpp \ GroupVarint.cpp \ GroupVarintTables.cpp \ @@ -342,11 +347,6 @@ libfolly_la_SOURCES = \ wangle/concurrent/IOThreadPoolExecutor.cpp \ wangle/concurrent/GlobalExecutor.cpp \ wangle/concurrent/ThreadPoolExecutor.cpp \ - wangle/futures/detail/ThreadWheelTimekeeper.cpp \ - wangle/futures/Future.cpp \ - wangle/futures/InlineExecutor.cpp \ - wangle/futures/ManualExecutor.cpp \ - wangle/futures/QueuedImmediateExecutor.cpp \ wangle/ssl/PasswordInFile.cpp \ wangle/ssl/SSLContextManager.cpp \ wangle/ssl/SSLSessionCacheManager.cpp \ diff --git a/folly/wangle/futures/Deprecated.h b/folly/futures/Deprecated.h similarity index 100% rename from folly/wangle/futures/Deprecated.h rename to folly/futures/Deprecated.h diff --git a/folly/wangle/futures/Future-inl.h b/folly/futures/Future-inl.h similarity index 99% rename from folly/wangle/futures/Future-inl.h rename to folly/futures/Future-inl.h index 61c386ad..c19f08a0 100644 --- a/folly/wangle/futures/Future-inl.h +++ b/folly/futures/Future-inl.h @@ -20,8 +20,8 @@ #include #include -#include -#include +#include +#include namespace folly { namespace wangle { diff --git a/folly/wangle/futures/Future.cpp b/folly/futures/Future.cpp similarity index 88% rename from folly/wangle/futures/Future.cpp rename to folly/futures/Future.cpp index 41bff823..fc7ff9b4 100644 --- a/folly/wangle/futures/Future.cpp +++ b/folly/futures/Future.cpp @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include -#include +#include +#include #include namespace folly { namespace wangle { namespace futures { diff --git a/folly/wangle/futures/Future.h b/folly/futures/Future.h similarity index 98% rename from folly/wangle/futures/Future.h rename to folly/futures/Future.h index f94a6b7d..e61c530c 100644 --- a/folly/wangle/futures/Future.h +++ b/folly/futures/Future.h @@ -24,11 +24,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace folly { namespace wangle { @@ -628,4 +628,4 @@ Future waitWithSemaphore(Future&& f, Dur timeout); }} // folly::wangle -#include +#include diff --git a/folly/wangle/futures/InlineExecutor.cpp b/folly/futures/InlineExecutor.cpp similarity index 100% rename from folly/wangle/futures/InlineExecutor.cpp rename to folly/futures/InlineExecutor.cpp diff --git a/folly/wangle/futures/InlineExecutor.h b/folly/futures/InlineExecutor.h similarity index 100% rename from folly/wangle/futures/InlineExecutor.h rename to folly/futures/InlineExecutor.h diff --git a/folly/wangle/futures/ManualExecutor.cpp b/folly/futures/ManualExecutor.cpp similarity index 97% rename from folly/wangle/futures/ManualExecutor.cpp rename to folly/futures/ManualExecutor.cpp index 9b68b1a1..e75ae72a 100644 --- a/folly/wangle/futures/ManualExecutor.cpp +++ b/folly/futures/ManualExecutor.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include #include diff --git a/folly/wangle/futures/ManualExecutor.h b/folly/futures/ManualExecutor.h similarity index 98% rename from folly/wangle/futures/ManualExecutor.h rename to folly/futures/ManualExecutor.h index 72a1c1d2..b17a0bde 100644 --- a/folly/wangle/futures/ManualExecutor.h +++ b/folly/futures/ManualExecutor.h @@ -15,7 +15,7 @@ */ #pragma once -#include +#include #include #include #include diff --git a/folly/wangle/futures/OpaqueCallbackShunt.h b/folly/futures/OpaqueCallbackShunt.h similarity index 97% rename from folly/wangle/futures/OpaqueCallbackShunt.h rename to folly/futures/OpaqueCallbackShunt.h index 2e7dbd16..7977fb08 100644 --- a/folly/wangle/futures/OpaqueCallbackShunt.h +++ b/folly/futures/OpaqueCallbackShunt.h @@ -16,7 +16,7 @@ #pragma once -#include +#include namespace folly { namespace wangle { diff --git a/folly/wangle/futures/Promise-inl.h b/folly/futures/Promise-inl.h similarity index 97% rename from folly/wangle/futures/Promise-inl.h rename to folly/futures/Promise-inl.h index 2ded4430..75b260cc 100644 --- a/folly/wangle/futures/Promise-inl.h +++ b/folly/futures/Promise-inl.h @@ -19,8 +19,8 @@ #include #include -#include -#include +#include +#include namespace folly { namespace wangle { diff --git a/folly/wangle/futures/Promise.h b/folly/futures/Promise.h similarity index 94% rename from folly/wangle/futures/Promise.h rename to folly/futures/Promise.h index af324a9d..58b73230 100644 --- a/folly/wangle/futures/Promise.h +++ b/folly/futures/Promise.h @@ -16,8 +16,8 @@ #pragma once -#include -#include +#include +#include #include namespace folly { namespace wangle { @@ -104,5 +104,5 @@ private: }} -#include -#include +#include +#include diff --git a/folly/wangle/futures/QueuedImmediateExecutor.cpp b/folly/futures/QueuedImmediateExecutor.cpp similarity index 94% rename from folly/wangle/futures/QueuedImmediateExecutor.cpp rename to folly/futures/QueuedImmediateExecutor.cpp index b82a486e..c9722878 100644 --- a/folly/wangle/futures/QueuedImmediateExecutor.cpp +++ b/folly/futures/QueuedImmediateExecutor.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include #include diff --git a/folly/wangle/futures/QueuedImmediateExecutor.h b/folly/futures/QueuedImmediateExecutor.h similarity index 100% rename from folly/wangle/futures/QueuedImmediateExecutor.h rename to folly/futures/QueuedImmediateExecutor.h diff --git a/folly/wangle/futures/README.md b/folly/futures/README.md similarity index 99% rename from folly/wangle/futures/README.md rename to folly/futures/README.md index a23d7c6e..cec17f56 100644 --- a/folly/wangle/futures/README.md +++ b/folly/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/futures/ScheduledExecutor.h b/folly/futures/ScheduledExecutor.h similarity index 100% rename from folly/wangle/futures/ScheduledExecutor.h rename to folly/futures/ScheduledExecutor.h diff --git a/folly/wangle/futures/Timekeeper.h b/folly/futures/Timekeeper.h similarity index 97% rename from folly/wangle/futures/Timekeeper.h rename to folly/futures/Timekeeper.h index f765fab6..7bbdddc5 100644 --- a/folly/wangle/futures/Timekeeper.h +++ b/folly/futures/Timekeeper.h @@ -16,7 +16,7 @@ #pragma once -#include +#include namespace folly { namespace wangle { @@ -71,7 +71,7 @@ class Timekeeper { }} // now get those definitions -#include +#include // finally we can use Future namespace folly { namespace wangle { diff --git a/folly/wangle/futures/Try-inl.h b/folly/futures/Try-inl.h similarity index 98% rename from folly/wangle/futures/Try-inl.h rename to folly/futures/Try-inl.h index 63a005bd..0aded746 100644 --- a/folly/wangle/futures/Try-inl.h +++ b/folly/futures/Try-inl.h @@ -18,7 +18,7 @@ #include -#include +#include namespace folly { namespace wangle { diff --git a/folly/wangle/futures/Try.h b/folly/futures/Try.h similarity index 98% rename from folly/wangle/futures/Try.h rename to folly/futures/Try.h index b262556e..e98682d6 100644 --- a/folly/wangle/futures/Try.h +++ b/folly/futures/Try.h @@ -22,8 +22,8 @@ #include #include #include -#include -#include +#include +#include namespace folly { namespace wangle { @@ -349,4 +349,4 @@ makeTryFunction(F&& f); }} -#include +#include diff --git a/folly/wangle/futures/WangleException.h b/folly/futures/WangleException.h similarity index 100% rename from folly/wangle/futures/WangleException.h rename to folly/futures/WangleException.h diff --git a/folly/wangle/futures/detail/Core.h b/folly/futures/detail/Core.h similarity index 97% rename from folly/wangle/futures/detail/Core.h rename to folly/futures/detail/Core.h index ae081027..1eb7062c 100644 --- a/folly/wangle/futures/detail/Core.h +++ b/folly/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/futures/detail/FSM.h b/folly/futures/detail/FSM.h similarity index 100% rename from folly/wangle/futures/detail/FSM.h rename to folly/futures/detail/FSM.h diff --git a/folly/wangle/futures/detail/ThreadWheelTimekeeper.cpp b/folly/futures/detail/ThreadWheelTimekeeper.cpp similarity index 98% rename from folly/wangle/futures/detail/ThreadWheelTimekeeper.cpp rename to folly/futures/detail/ThreadWheelTimekeeper.cpp index d3c63155..d77e68e9 100644 --- a/folly/wangle/futures/detail/ThreadWheelTimekeeper.cpp +++ b/folly/futures/detail/ThreadWheelTimekeeper.cpp @@ -16,7 +16,7 @@ #include "ThreadWheelTimekeeper.h" #include -#include +#include #include namespace folly { namespace wangle { namespace detail { diff --git a/folly/wangle/futures/detail/ThreadWheelTimekeeper.h b/folly/futures/detail/ThreadWheelTimekeeper.h similarity index 94% rename from folly/wangle/futures/detail/ThreadWheelTimekeeper.h rename to folly/futures/detail/ThreadWheelTimekeeper.h index 35e895d8..1174dceb 100644 --- a/folly/wangle/futures/detail/ThreadWheelTimekeeper.h +++ b/folly/futures/detail/ThreadWheelTimekeeper.h @@ -16,8 +16,8 @@ #pragma once -#include -#include +#include +#include #include #include #include diff --git a/folly/wangle/futures/detail/Types.h b/folly/futures/detail/Types.h similarity index 100% rename from folly/wangle/futures/detail/Types.h rename to folly/futures/detail/Types.h diff --git a/folly/wangle/futures/test/Benchmark.cpp b/folly/futures/test/Benchmark.cpp similarity index 98% rename from folly/wangle/futures/test/Benchmark.cpp rename to folly/futures/test/Benchmark.cpp index dc811ce3..0f73d3f1 100644 --- a/folly/wangle/futures/test/Benchmark.cpp +++ b/folly/futures/test/Benchmark.cpp @@ -17,8 +17,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/folly/wangle/futures/test/ClientCompile.cpp b/folly/futures/test/ClientCompile.cpp similarity index 85% rename from folly/wangle/futures/test/ClientCompile.cpp rename to folly/futures/test/ClientCompile.cpp index ab18d12e..80d20cbf 100644 --- a/folly/wangle/futures/test/ClientCompile.cpp +++ b/folly/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/futures/test/ExecutorTest.cpp b/folly/futures/test/ExecutorTest.cpp similarity index 94% rename from folly/wangle/futures/test/ExecutorTest.cpp rename to folly/futures/test/ExecutorTest.cpp index 67f43ec5..2e9a3f6a 100644 --- a/folly/wangle/futures/test/ExecutorTest.cpp +++ b/folly/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/futures/test/FSM.cpp b/folly/futures/test/FSM.cpp similarity index 98% rename from folly/wangle/futures/test/FSM.cpp rename to folly/futures/test/FSM.cpp index ff75f868..e4fef36b 100644 --- a/folly/wangle/futures/test/FSM.cpp +++ b/folly/futures/test/FSM.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include using namespace folly::wangle::detail; diff --git a/folly/wangle/futures/test/FutureTest.cpp b/folly/futures/test/FutureTest.cpp similarity index 99% rename from folly/wangle/futures/test/FutureTest.cpp rename to folly/futures/test/FutureTest.cpp index 939ff2eb..c135bf2f 100644 --- a/folly/wangle/futures/test/FutureTest.cpp +++ b/folly/futures/test/FutureTest.cpp @@ -25,8 +25,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/folly/wangle/futures/test/Interrupts.cpp b/folly/futures/test/Interrupts.cpp similarity index 95% rename from folly/wangle/futures/test/Interrupts.cpp rename to folly/futures/test/Interrupts.cpp index 9204efaf..d4a35a75 100644 --- a/folly/wangle/futures/test/Interrupts.cpp +++ b/folly/futures/test/Interrupts.cpp @@ -16,8 +16,8 @@ #include -#include -#include +#include +#include using namespace folly::wangle; using folly::exception_wrapper; diff --git a/folly/wangle/futures/test/Thens.cpp b/folly/futures/test/Thens.cpp similarity index 97% rename from folly/wangle/futures/test/Thens.cpp rename to folly/futures/test/Thens.cpp index 2ebbf486..1fb33dc1 100644 --- a/folly/wangle/futures/test/Thens.cpp +++ b/folly/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/futures/test/Thens.h b/folly/futures/test/Thens.h similarity index 98% rename from folly/wangle/futures/test/Thens.h rename to folly/futures/test/Thens.h index d0398487..d65d914f 100644 --- a/folly/wangle/futures/test/Thens.h +++ b/folly/futures/test/Thens.h @@ -17,7 +17,7 @@ #pragma once #include #include -#include +#include #include using namespace folly::wangle; diff --git a/folly/wangle/futures/test/TimekeeperTest.cpp b/folly/futures/test/TimekeeperTest.cpp similarity index 98% rename from folly/wangle/futures/test/TimekeeperTest.cpp rename to folly/futures/test/TimekeeperTest.cpp index 49f8b0c9..2ede4673 100644 --- a/folly/wangle/futures/test/TimekeeperTest.cpp +++ b/folly/futures/test/TimekeeperTest.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include #include using namespace folly::wangle; diff --git a/folly/wangle/futures/test/Try.cpp b/folly/futures/test/Try.cpp similarity index 97% rename from folly/wangle/futures/test/Try.cpp rename to folly/futures/test/Try.cpp index 9b2f4f74..5846f628 100644 --- a/folly/wangle/futures/test/Try.cpp +++ b/folly/futures/test/Try.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include using namespace folly::wangle; diff --git a/folly/wangle/futures/test/ViaTest.cpp b/folly/futures/test/ViaTest.cpp similarity index 97% rename from folly/wangle/futures/test/ViaTest.cpp rename to folly/futures/test/ViaTest.cpp index 80765ff0..d940e10e 100644 --- a/folly/wangle/futures/test/ViaTest.cpp +++ b/folly/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/futures/test/main.cpp b/folly/futures/test/main.cpp similarity index 100% rename from folly/wangle/futures/test/main.cpp rename to folly/futures/test/main.cpp diff --git a/folly/wangle/futures/test/thens.rb b/folly/futures/test/thens.rb similarity index 97% rename from folly/wangle/futures/test/thens.rb rename to folly/futures/test/thens.rb index 4aaa8463..7b2fa698 100755 --- a/folly/wangle/futures/test/thens.rb +++ b/folly/futures/test/thens.rb @@ -66,7 +66,7 @@ print < +#include TEST(Future, thenVariants) { SomeClass anObject; diff --git a/folly/wangle/channel/ChannelHandler.h b/folly/wangle/channel/ChannelHandler.h index 8e134a3f..92829436 100644 --- a/folly/wangle/channel/ChannelHandler.h +++ b/folly/wangle/channel/ChannelHandler.h @@ -16,7 +16,7 @@ #pragma once -#include +#include #include #include #include diff --git a/folly/wangle/channel/ChannelHandlerContext.h b/folly/wangle/channel/ChannelHandlerContext.h index 59ea3ae4..00982f4a 100644 --- a/folly/wangle/channel/ChannelHandlerContext.h +++ b/folly/wangle/channel/ChannelHandlerContext.h @@ -17,7 +17,7 @@ #pragma once #include -#include +#include #include namespace folly { namespace wangle { diff --git a/folly/wangle/channel/ChannelPipeline.h b/folly/wangle/channel/ChannelPipeline.h index 6536efac..1a1a0a31 100644 --- a/folly/wangle/channel/ChannelPipeline.h +++ b/folly/wangle/channel/ChannelPipeline.h @@ -17,7 +17,7 @@ #pragma once #include -#include +#include #include #include #include diff --git a/folly/wangle/concurrent/FutureExecutor.h b/folly/wangle/concurrent/FutureExecutor.h index 8aeedff8..a3e18c5a 100644 --- a/folly/wangle/concurrent/FutureExecutor.h +++ b/folly/wangle/concurrent/FutureExecutor.h @@ -15,7 +15,7 @@ */ #pragma once -#include +#include namespace folly { namespace wangle { -- 2.34.1