Commit f2ac9a5c authored by James Sedgwick's avatar James Sedgwick Committed by JoelMarcey

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
parent 67bc1788
...@@ -237,21 +237,21 @@ nobase_follyinclude_HEADERS = \ ...@@ -237,21 +237,21 @@ nobase_follyinclude_HEADERS = \
Uri-inl.h \ Uri-inl.h \
Varint.h \ Varint.h \
VersionCheck.h \ VersionCheck.h \
wangle/Deprecated.h \ wangle/futures/Deprecated.h \
wangle/Future-inl.h \ wangle/futures/Future-inl.h \
wangle/Future.h \ wangle/futures/Future.h \
wangle/InlineExecutor.h \ wangle/futures/InlineExecutor.h \
wangle/ManualExecutor.h \ wangle/futures/ManualExecutor.h \
wangle/OpaqueCallbackShunt.h \ wangle/futures/OpaqueCallbackShunt.h \
wangle/Promise-inl.h \ wangle/futures/Promise-inl.h \
wangle/Promise.h \ wangle/futures/Promise.h \
wangle/QueuedImmediateExecutor.h \ wangle/futures/QueuedImmediateExecutor.h \
wangle/ScheduledExecutor.h \ wangle/futures/ScheduledExecutor.h \
wangle/Try-inl.h \ wangle/futures/Try-inl.h \
wangle/Try.h \ wangle/futures/Try.h \
wangle/WangleException.h \ wangle/futures/WangleException.h \
wangle/detail/Core.h \ wangle/futures/detail/Core.h \
wangle/detail/FSM.h wangle/futures/detail/FSM.h
FormatTables.cpp: build/generate_format_tables.py FormatTables.cpp: build/generate_format_tables.py
build/generate_format_tables.py build/generate_format_tables.py
...@@ -323,8 +323,8 @@ libfolly_la_SOURCES = \ ...@@ -323,8 +323,8 @@ libfolly_la_SOURCES = \
TimeoutQueue.cpp \ TimeoutQueue.cpp \
Uri.cpp \ Uri.cpp \
Version.cpp \ Version.cpp \
wangle/InlineExecutor.cpp \ wangle/futures/InlineExecutor.cpp \
wangle/ManualExecutor.cpp \ wangle/futures/ManualExecutor.cpp \
experimental/io/FsUtil.cpp \ experimental/io/FsUtil.cpp \
experimental/Singleton.cpp \ experimental/Singleton.cpp \
experimental/TestUtil.cpp \ experimental/TestUtil.cpp \
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#pragma once #pragma once
#include <folly/wangle/Future.h> #include <folly/wangle/futures/Future.h>
#include <folly/experimental/wangle/channel/ChannelPipeline.h> #include <folly/experimental/wangle/channel/ChannelPipeline.h>
#include <folly/io/IOBuf.h> #include <folly/io/IOBuf.h>
#include <folly/io/IOBufQueue.h> #include <folly/io/IOBufQueue.h>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#pragma once #pragma once
#include <folly/io/async/AsyncTransport.h> #include <folly/io/async/AsyncTransport.h>
#include <folly/wangle/Future.h> #include <folly/wangle/futures/Future.h>
#include <folly/ExceptionWrapper.h> #include <folly/ExceptionWrapper.h>
namespace folly { namespace wangle { namespace folly { namespace wangle {
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#pragma once #pragma once
#include <folly/experimental/wangle/channel/ChannelHandlerContext.h> #include <folly/experimental/wangle/channel/ChannelHandlerContext.h>
#include <folly/wangle/Future.h> #include <folly/wangle/futures/Future.h>
#include <folly/io/async/AsyncTransport.h> #include <folly/io/async/AsyncTransport.h>
#include <folly/io/async/DelayedDestruction.h> #include <folly/io/async/DelayedDestruction.h>
#include <folly/ExceptionWrapper.h> #include <folly/ExceptionWrapper.h>
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
*/ */
#pragma once #pragma once
#include <folly/wangle/Future.h> #include <folly/wangle/futures/Future.h>
namespace folly { namespace wangle { namespace folly { namespace wangle {
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <chrono> #include <chrono>
#include <thread> #include <thread>
#include <folly/wangle/detail/Core.h> #include <folly/wangle/futures/detail/Core.h>
#include <folly/Baton.h> #include <folly/Baton.h>
namespace folly { namespace wangle { namespace folly { namespace wangle {
......
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
#include <vector> #include <vector>
#include <folly/MoveWrapper.h> #include <folly/MoveWrapper.h>
#include <folly/wangle/Promise.h> #include <folly/wangle/futures/Promise.h>
#include <folly/wangle/Try.h> #include <folly/wangle/futures/Try.h>
namespace folly { namespace wangle { namespace folly { namespace wangle {
...@@ -501,4 +501,4 @@ Future<T> waitWithSemaphore(Future<T>&& f, Duration timeout); ...@@ -501,4 +501,4 @@ Future<T> waitWithSemaphore(Future<T>&& f, Duration timeout);
}} // folly::wangle }} // folly::wangle
#include <folly/wangle/Future-inl.h> #include <folly/wangle/futures/Future-inl.h>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include <folly/wangle/ManualExecutor.h> #include <folly/wangle/futures/ManualExecutor.h>
#include <string.h> #include <string.h>
#include <string> #include <string>
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
*/ */
#pragma once #pragma once
#include <folly/wangle/ScheduledExecutor.h> #include <folly/wangle/futures/ScheduledExecutor.h>
#include <semaphore.h> #include <semaphore.h>
#include <memory> #include <memory>
#include <mutex> #include <mutex>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#pragma once #pragma once
#include <folly/wangle/Promise.h> #include <folly/wangle/futures/Promise.h>
namespace folly { namespace wangle { namespace folly { namespace wangle {
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
#include <atomic> #include <atomic>
#include <thread> #include <thread>
#include <folly/wangle/WangleException.h> #include <folly/wangle/futures/WangleException.h>
#include <folly/wangle/detail/Core.h> #include <folly/wangle/futures/detail/Core.h>
namespace folly { namespace wangle { namespace folly { namespace wangle {
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#pragma once #pragma once
#include <folly/wangle/Try.h> #include <folly/wangle/futures/Try.h>
namespace folly { namespace wangle { namespace folly { namespace wangle {
...@@ -97,5 +97,5 @@ private: ...@@ -97,5 +97,5 @@ private:
}} }}
#include <folly/wangle/Future.h> #include <folly/wangle/futures/Future.h>
#include <folly/wangle/Promise-inl.h> #include <folly/wangle/futures/Promise-inl.h>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include <folly/wangle/QueuedImmediateExecutor.h> #include <folly/wangle/futures/QueuedImmediateExecutor.h>
#include <folly/ThreadLocal.h> #include <folly/ThreadLocal.h>
#include <queue> #include <queue>
......
...@@ -18,7 +18,7 @@ The primary semantic differences are that Wangle Futures and Promises are not th ...@@ -18,7 +18,7 @@ The primary semantic differences are that Wangle Futures and Promises are not th
## Brief Synopsis ## Brief Synopsis
```C++ ```C++
#include <folly/wangle/Future.h> #include <folly/wangle/futures/Future.h>
using namespace folly::wangle; using namespace folly::wangle;
using namespace std; using namespace std;
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <stdexcept> #include <stdexcept>
#include <folly/wangle/WangleException.h> #include <folly/wangle/futures/WangleException.h>
namespace folly { namespace wangle { namespace folly { namespace wangle {
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <exception> #include <exception>
#include <algorithm> #include <algorithm>
#include <folly/Likely.h> #include <folly/Likely.h>
#include <folly/wangle/WangleException.h> #include <folly/wangle/futures/WangleException.h>
namespace folly { namespace wangle { namespace folly { namespace wangle {
...@@ -143,4 +143,4 @@ makeTryFunction(F&& f); ...@@ -143,4 +143,4 @@ makeTryFunction(F&& f);
}} }}
#include <folly/wangle/Try-inl.h> #include <folly/wangle/futures/Try-inl.h>
...@@ -24,11 +24,11 @@ ...@@ -24,11 +24,11 @@
#include <folly/Optional.h> #include <folly/Optional.h>
#include <folly/SmallLocks.h> #include <folly/SmallLocks.h>
#include <folly/wangle/Try.h> #include <folly/wangle/futures/Try.h>
#include <folly/wangle/Promise.h> #include <folly/wangle/futures/Promise.h>
#include <folly/wangle/Future.h> #include <folly/wangle/futures/Future.h>
#include <folly/Executor.h> #include <folly/Executor.h>
#include <folly/wangle/detail/FSM.h> #include <folly/wangle/futures/detail/FSM.h>
#include <folly/io/async/Request.h> #include <folly/io/async/Request.h>
......
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
#include <gflags/gflags.h> #include <gflags/gflags.h>
#include <folly/Baton.h> #include <folly/Baton.h>
#include <folly/Benchmark.h> #include <folly/Benchmark.h>
#include <folly/wangle/Future.h> #include <folly/wangle/futures/Future.h>
#include <folly/wangle/Promise.h> #include <folly/wangle/futures/Promise.h>
#include <semaphore.h> #include <semaphore.h>
#include <vector> #include <vector>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
// amazing what things can go wrong if you include things in an unexpected // amazing what things can go wrong if you include things in an unexpected
// order. // order.
#include <folly/wangle/Try.h> #include <folly/wangle/futures/Try.h>
#include <folly/wangle/Promise.h> #include <folly/wangle/futures/Promise.h>
#include <folly/wangle/Future.h> #include <folly/wangle/futures/Future.h>
int main() { return 0; } int main() { return 0; }
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
*/ */
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <folly/wangle/InlineExecutor.h> #include <folly/wangle/futures/InlineExecutor.h>
#include <folly/wangle/ManualExecutor.h> #include <folly/wangle/futures/ManualExecutor.h>
#include <folly/wangle/QueuedImmediateExecutor.h> #include <folly/wangle/futures/QueuedImmediateExecutor.h>
#include <folly/wangle/Future.h> #include <folly/wangle/futures/Future.h>
#include <folly/Baton.h> #include <folly/Baton.h>
using namespace folly::wangle; using namespace folly::wangle;
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
*/ */
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <folly/wangle/detail/FSM.h> #include <folly/wangle/futures/detail/FSM.h>
using namespace folly::wangle::detail; using namespace folly::wangle::detail;
......
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
#include <unistd.h> #include <unistd.h>
#include <folly/Memory.h> #include <folly/Memory.h>
#include <folly/Executor.h> #include <folly/Executor.h>
#include <folly/wangle/Future.h> #include <folly/wangle/futures/Future.h>
#include <folly/wangle/ManualExecutor.h> #include <folly/wangle/futures/ManualExecutor.h>
#include <folly/MPMCQueue.h> #include <folly/MPMCQueue.h>
#include <folly/io/async/Request.h> #include <folly/io/async/Request.h>
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <folly/wangle/Future.h> #include <folly/wangle/futures/Future.h>
#include <folly/wangle/Promise.h> #include <folly/wangle/futures/Promise.h>
using namespace folly::wangle; using namespace folly::wangle;
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
// TODO: fails to compile with clang:dev. See task #4412111 // TODO: fails to compile with clang:dev. See task #4412111
#ifndef __clang__ #ifndef __clang__
#include <folly/wangle/test/Thens.h> #include <folly/wangle/futures/test/Thens.h>
TEST(Future, thenVariants) { TEST(Future, thenVariants) {
SomeClass anObject; SomeClass anObject;
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#pragma once #pragma once
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <memory> #include <memory>
#include <folly/wangle/Future.h> #include <folly/wangle/futures/Future.h>
#include <folly/Executor.h> #include <folly/Executor.h>
using namespace folly::wangle; using namespace folly::wangle;
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <folly/Memory.h> #include <folly/Memory.h>
#include <folly/wangle/Try.h> #include <folly/wangle/futures/Try.h>
using namespace folly::wangle; using namespace folly::wangle;
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <thread> #include <thread>
#include <folly/wangle/Future.h> #include <folly/wangle/futures/Future.h>
#include <folly/wangle/InlineExecutor.h> #include <folly/wangle/futures/InlineExecutor.h>
#include <folly/wangle/ManualExecutor.h> #include <folly/wangle/futures/ManualExecutor.h>
using namespace folly::wangle; using namespace folly::wangle;
......
...@@ -66,7 +66,7 @@ print <<EOF ...@@ -66,7 +66,7 @@ print <<EOF
// TODO: fails to compile with clang:dev. See task #4412111 // TODO: fails to compile with clang:dev. See task #4412111
#ifndef __clang__ #ifndef __clang__
#include <folly/wangle/test/Thens.h> #include <folly/wangle/futures/test/Thens.h>
TEST(Future, thenVariants) { TEST(Future, thenVariants) {
SomeClass anObject; SomeClass anObject;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment