From 5e8d8951109ed9bcc29fed28dfe62d9d51b3b6d4 Mon Sep 17 00:00:00 2001 From: James Sedgwick Date: Thu, 18 Dec 2014 12:20:26 -0800 Subject: [PATCH] codemod: merge folly/wangle and folly/experimental/wangle Summary: Various TARGETS could definitely use some rearranging but I'd rather wait until we're cut over to the new repo Test Plan: wait for contbuild Reviewed By: davejwatson@fb.com Subscribers: ptarjan, joelm, trunkagent, hphp-diffs@, ps, fbcode-common-diffs@, fugalh, alandau, bmatheny, everstore-dev@, mwa, jgehring, fuegen, mshneer, folly-diffs@, hannesr FB internal diff: D1740858 Tasks: 5802833 Signature: t1:1740858:1418752569:4d7d9c5b955e4d9fab4b322cf08a3d285e3db7ce --- folly/Makefile.am | 126 +++++++++--------- .../wangle/acceptor/Acceptor.cpp | 8 +- .../wangle/acceptor/Acceptor.h | 12 +- .../wangle/acceptor/ConnectionCounter.h | 0 .../acceptor}/ConnectionManager.cpp | 2 +- .../acceptor}/ConnectionManager.h | 2 +- .../wangle/acceptor/DomainNameMisc.h | 0 .../wangle/acceptor/LoadShedConfiguration.cpp | 2 +- .../wangle/acceptor/LoadShedConfiguration.h | 2 +- .../acceptor}/ManagedConnection.cpp | 4 +- .../acceptor}/ManagedConnection.h | 0 .../wangle/acceptor/NetworkAddress.h | 0 .../wangle/acceptor/ServerSocketConfig.h | 10 +- .../wangle/acceptor/SocketOptions.cpp | 2 +- .../wangle/acceptor/SocketOptions.h | 0 .../wangle/acceptor/TransportInfo.cpp | 2 +- .../wangle/acceptor/TransportInfo.h | 2 +- .../wangle/bootstrap/BootstrapTest.cpp | 6 +- .../wangle/bootstrap/ClientBootstrap.h | 2 +- .../wangle/bootstrap/ServerBootstrap-inl.h | 8 +- .../wangle/bootstrap/ServerBootstrap.cpp | 4 +- .../wangle/bootstrap/ServerBootstrap.h | 2 +- .../wangle/channel/AsyncSocketHandler.h | 2 +- .../wangle/channel/ChannelHandler.h | 2 +- .../wangle/channel/ChannelHandlerContext.h | 0 .../wangle/channel/ChannelPipeline.h | 2 +- .../wangle/channel/OutputBufferingHandler.h | 2 +- .../channel/test/ChannelPipelineTest.cpp | 10 +- .../wangle/channel/test/MockChannelHandler.h | 2 +- .../test/OutputBufferingHandlerTest.cpp | 6 +- .../wangle/concurrent/BlockingQueue.h | 0 .../concurrent/CPUThreadPoolExecutor.cpp | 4 +- .../wangle/concurrent/CPUThreadPoolExecutor.h | 2 +- .../wangle/concurrent/Codel.cpp | 2 +- .../wangle/concurrent/Codel.h | 0 .../wangle/concurrent/FutureExecutor.h | 0 .../wangle/concurrent/GlobalExecutor.cpp | 4 +- .../wangle/concurrent/GlobalExecutor.h | 0 .../wangle/concurrent/IOExecutor.cpp | 4 +- .../wangle/concurrent/IOExecutor.h | 0 .../concurrent/IOThreadPoolExecutor.cpp | 2 +- .../wangle/concurrent/IOThreadPoolExecutor.h | 4 +- .../wangle/concurrent/LifoSemMPMCQueue.h | 2 +- .../wangle/concurrent/NamedThreadFactory.h | 2 +- .../concurrent/PriorityLifoSemMPMCQueue.h | 2 +- .../wangle/concurrent/ThreadFactory.h | 0 .../wangle/concurrent/ThreadPoolExecutor.cpp | 2 +- .../wangle/concurrent/ThreadPoolExecutor.h | 6 +- .../wangle/concurrent/test/CodelTest.cpp | 2 +- .../concurrent/test/GlobalExecutorTest.cpp | 4 +- .../test/ThreadPoolExecutorTest.cpp | 8 +- folly/{experimental => }/wangle/rx/Dummy.cpp | 0 .../{experimental => }/wangle/rx/Observable.h | 6 +- folly/{experimental => }/wangle/rx/Observer.h | 2 +- folly/{experimental => }/wangle/rx/README | 0 folly/{experimental => }/wangle/rx/Subject.h | 4 +- .../wangle/rx/Subscription.h | 2 +- .../wangle/rx/test/RxBenchmark.cpp | 4 +- .../wangle/rx/test/RxTest.cpp | 4 +- folly/{experimental => }/wangle/rx/types.h | 0 .../wangle/ssl/ClientHelloExtStats.h | 0 folly/{experimental => }/wangle/ssl/DHParam.h | 0 .../wangle/ssl/PasswordInFile.cpp | 2 +- .../wangle/ssl/PasswordInFile.h | 0 .../wangle/ssl/SSLCacheOptions.h | 0 .../wangle/ssl/SSLCacheProvider.h | 0 .../wangle/ssl/SSLContextConfig.h | 0 .../wangle/ssl/SSLContextManager.cpp | 20 +-- .../wangle/ssl/SSLContextManager.h | 8 +- .../wangle/ssl/SSLSessionCacheManager.cpp | 8 +- .../wangle/ssl/SSLSessionCacheManager.h | 4 +- .../{experimental => }/wangle/ssl/SSLStats.h | 0 .../{experimental => }/wangle/ssl/SSLUtil.cpp | 2 +- folly/{experimental => }/wangle/ssl/SSLUtil.h | 0 .../wangle/ssl/TLSTicketKeyManager.cpp | 6 +- .../wangle/ssl/TLSTicketKeyManager.h | 0 .../wangle/ssl/TLSTicketKeySeeds.h | 0 .../wangle/ssl/test/SSLCacheTest.cpp | 0 .../wangle/ssl/test/SSLContextManagerTest.cpp | 4 +- 79 files changed, 174 insertions(+), 174 deletions(-) rename folly/{experimental => }/wangle/acceptor/Acceptor.cpp (98%) rename folly/{experimental => }/wangle/acceptor/Acceptor.h (96%) rename folly/{experimental => }/wangle/acceptor/ConnectionCounter.h (100%) rename folly/{experimental/wangle => wangle/acceptor}/ConnectionManager.cpp (98%) rename folly/{experimental/wangle => wangle/acceptor}/ConnectionManager.h (99%) rename folly/{experimental => }/wangle/acceptor/DomainNameMisc.h (100%) rename folly/{experimental => }/wangle/acceptor/LoadShedConfiguration.cpp (94%) rename folly/{experimental => }/wangle/acceptor/LoadShedConfiguration.h (97%) rename folly/{experimental/wangle => wangle/acceptor}/ManagedConnection.cpp (92%) rename folly/{experimental/wangle => wangle/acceptor}/ManagedConnection.h (100%) rename folly/{experimental => }/wangle/acceptor/NetworkAddress.h (100%) rename folly/{experimental => }/wangle/acceptor/ServerSocketConfig.h (90%) rename folly/{experimental => }/wangle/acceptor/SocketOptions.cpp (93%) rename folly/{experimental => }/wangle/acceptor/SocketOptions.h (100%) rename folly/{experimental => }/wangle/acceptor/TransportInfo.cpp (96%) rename folly/{experimental => }/wangle/acceptor/TransportInfo.h (99%) rename folly/{experimental => }/wangle/bootstrap/BootstrapTest.cpp (95%) rename folly/{experimental => }/wangle/bootstrap/ClientBootstrap.h (95%) rename folly/{experimental => }/wangle/bootstrap/ServerBootstrap-inl.h (93%) rename folly/{experimental => }/wangle/bootstrap/ServerBootstrap.cpp (92%) rename folly/{experimental => }/wangle/bootstrap/ServerBootstrap.h (99%) rename folly/{experimental => }/wangle/channel/AsyncSocketHandler.h (98%) rename folly/{experimental => }/wangle/channel/ChannelHandler.h (98%) rename folly/{experimental => }/wangle/channel/ChannelHandlerContext.h (100%) rename folly/{experimental => }/wangle/channel/ChannelPipeline.h (99%) rename folly/{experimental => }/wangle/channel/OutputBufferingHandler.h (97%) rename folly/{experimental => }/wangle/channel/test/ChannelPipelineTest.cpp (95%) rename folly/{experimental => }/wangle/channel/test/MockChannelHandler.h (96%) rename folly/{experimental => }/wangle/channel/test/OutputBufferingHandlerTest.cpp (90%) rename folly/{experimental => }/wangle/concurrent/BlockingQueue.h (100%) rename folly/{experimental => }/wangle/concurrent/CPUThreadPoolExecutor.cpp (96%) rename folly/{experimental => }/wangle/concurrent/CPUThreadPoolExecutor.h (97%) rename folly/{experimental => }/wangle/concurrent/Codel.cpp (97%) rename folly/{experimental => }/wangle/concurrent/Codel.h (100%) rename folly/{experimental => }/wangle/concurrent/FutureExecutor.h (100%) rename folly/{experimental => }/wangle/concurrent/GlobalExecutor.cpp (91%) rename folly/{experimental => }/wangle/concurrent/GlobalExecutor.h (100%) rename folly/{experimental => }/wangle/concurrent/IOExecutor.cpp (91%) rename folly/{experimental => }/wangle/concurrent/IOExecutor.h (100%) rename folly/{experimental => }/wangle/concurrent/IOThreadPoolExecutor.cpp (98%) rename folly/{experimental => }/wangle/concurrent/IOThreadPoolExecutor.h (93%) rename folly/{experimental => }/wangle/concurrent/LifoSemMPMCQueue.h (95%) rename folly/{experimental => }/wangle/concurrent/NamedThreadFactory.h (95%) rename folly/{experimental => }/wangle/concurrent/PriorityLifoSemMPMCQueue.h (96%) rename folly/{experimental => }/wangle/concurrent/ThreadFactory.h (100%) rename folly/{experimental => }/wangle/concurrent/ThreadPoolExecutor.cpp (98%) rename folly/{experimental => }/wangle/concurrent/ThreadPoolExecutor.h (96%) rename folly/{experimental => }/wangle/concurrent/test/CodelTest.cpp (96%) rename folly/{experimental => }/wangle/concurrent/test/GlobalExecutorTest.cpp (91%) rename folly/{experimental => }/wangle/concurrent/test/ThreadPoolExecutorTest.cpp (96%) rename folly/{experimental => }/wangle/rx/Dummy.cpp (100%) rename folly/{experimental => }/wangle/rx/Observable.h (98%) rename folly/{experimental => }/wangle/rx/Observer.h (98%) rename folly/{experimental => }/wangle/rx/README (100%) rename folly/{experimental => }/wangle/rx/Subject.h (92%) rename folly/{experimental => }/wangle/rx/Subscription.h (96%) rename folly/{experimental => }/wangle/rx/test/RxBenchmark.cpp (97%) rename folly/{experimental => }/wangle/rx/test/RxTest.cpp (98%) rename folly/{experimental => }/wangle/rx/types.h (100%) rename folly/{experimental => }/wangle/ssl/ClientHelloExtStats.h (100%) rename folly/{experimental => }/wangle/ssl/DHParam.h (100%) rename folly/{experimental => }/wangle/ssl/PasswordInFile.cpp (92%) rename folly/{experimental => }/wangle/ssl/PasswordInFile.h (100%) rename folly/{experimental => }/wangle/ssl/SSLCacheOptions.h (100%) rename folly/{experimental => }/wangle/ssl/SSLCacheProvider.h (100%) rename folly/{experimental => }/wangle/ssl/SSLContextConfig.h (100%) rename folly/{experimental => }/wangle/ssl/SSLContextManager.cpp (97%) rename folly/{experimental => }/wangle/ssl/SSLContextManager.h (95%) rename folly/{experimental => }/wangle/ssl/SSLSessionCacheManager.cpp (98%) rename folly/{experimental => }/wangle/ssl/SSLSessionCacheManager.h (98%) rename folly/{experimental => }/wangle/ssl/SSLStats.h (100%) rename folly/{experimental => }/wangle/ssl/SSLUtil.cpp (97%) rename folly/{experimental => }/wangle/ssl/SSLUtil.h (100%) rename folly/{experimental => }/wangle/ssl/TLSTicketKeyManager.cpp (98%) rename folly/{experimental => }/wangle/ssl/TLSTicketKeyManager.h (100%) rename folly/{experimental => }/wangle/ssl/TLSTicketKeySeeds.h (100%) rename folly/{experimental => }/wangle/ssl/test/SSLCacheTest.cpp (100%) rename folly/{experimental => }/wangle/ssl/test/SSLContextManagerTest.cpp (95%) diff --git a/folly/Makefile.am b/folly/Makefile.am index 4a044257..95cc3143 100644 --- a/folly/Makefile.am +++ b/folly/Makefile.am @@ -74,49 +74,6 @@ nobase_follyinclude_HEADERS = \ experimental/io/FsUtil.h \ experimental/Singleton.h \ experimental/TestUtil.h \ - experimental/wangle/channel/AsyncSocketHandler.h \ - experimental/wangle/channel/ChannelHandler.h \ - experimental/wangle/channel/ChannelHandlerContext.h \ - experimental/wangle/channel/ChannelPipeline.h \ - experimental/wangle/channel/OutputBufferingHandler.h \ - experimental/wangle/concurrent/BlockingQueue.h \ - experimental/wangle/concurrent/Codel.h \ - experimental/wangle/concurrent/CPUThreadPoolExecutor.h \ - experimental/wangle/concurrent/FutureExecutor.h \ - experimental/wangle/concurrent/GlobalExecutor.h \ - experimental/wangle/concurrent/IOExecutor.h \ - experimental/wangle/concurrent/IOThreadPoolExecutor.h \ - experimental/wangle/concurrent/LifoSemMPMCQueue.h \ - experimental/wangle/concurrent/NamedThreadFactory.h \ - experimental/wangle/concurrent/ThreadFactory.h \ - experimental/wangle/concurrent/ThreadPoolExecutor.h \ - experimental/wangle/rx/Observable.h \ - experimental/wangle/rx/Observer.h \ - experimental/wangle/rx/Subject.h \ - experimental/wangle/rx/Subscription.h \ - experimental/wangle/rx/types.h \ - experimental/wangle/ConnectionManager.h \ - experimental/wangle/ManagedConnection.h \ - experimental/wangle/acceptor/Acceptor.h \ - experimental/wangle/acceptor/ConnectionCounter.h \ - experimental/wangle/acceptor/SocketOptions.h \ - experimental/wangle/acceptor/DomainNameMisc.h \ - experimental/wangle/acceptor/LoadShedConfiguration.h \ - experimental/wangle/acceptor/NetworkAddress.h \ - experimental/wangle/acceptor/ServerSocketConfig.h \ - experimental/wangle/acceptor/TransportInfo.h \ - experimental/wangle/ssl/ClientHelloExtStats.h \ - experimental/wangle/ssl/DHParam.h \ - experimental/wangle/ssl/PasswordInFile.h \ - experimental/wangle/ssl/SSLCacheOptions.h \ - experimental/wangle/ssl/SSLCacheProvider.h \ - experimental/wangle/ssl/SSLContextConfig.h \ - experimental/wangle/ssl/SSLContextManager.h \ - experimental/wangle/ssl/SSLSessionCacheManager.h \ - experimental/wangle/ssl/SSLStats.h \ - experimental/wangle/ssl/SSLUtil.h \ - experimental/wangle/ssl/TLSTicketKeyManager.h \ - experimental/wangle/ssl/TLSTicketKeySeeds.h \ FBString.h \ FBVector.h \ File.h \ @@ -238,6 +195,32 @@ nobase_follyinclude_HEADERS = \ Uri-inl.h \ Varint.h \ VersionCheck.h \ + wangle/acceptor/Acceptor.h \ + wangle/acceptor/ConnectionCounter.h \ + wangle/acceptor/ConnectionManager.h \ + wangle/acceptor/DomainNameMisc.h \ + wangle/acceptor/LoadShedConfiguration.h \ + wangle/acceptor/ManagedConnection.h \ + wangle/acceptor/NetworkAddress.h \ + wangle/acceptor/ServerSocketConfig.h \ + wangle/acceptor/SocketOptions.h \ + wangle/acceptor/TransportInfo.h \ + wangle/channel/AsyncSocketHandler.h \ + wangle/channel/ChannelHandler.h \ + wangle/channel/ChannelHandlerContext.h \ + wangle/channel/ChannelPipeline.h \ + wangle/channel/OutputBufferingHandler.h \ + wangle/concurrent/BlockingQueue.h \ + wangle/concurrent/Codel.h \ + wangle/concurrent/CPUThreadPoolExecutor.h \ + wangle/concurrent/FutureExecutor.h \ + wangle/concurrent/IOExecutor.h \ + wangle/concurrent/IOThreadPoolExecutor.h \ + wangle/concurrent/GlobalExecutor.h \ + wangle/concurrent/LifoSemMPMCQueue.h \ + 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 \ @@ -252,7 +235,24 @@ nobase_follyinclude_HEADERS = \ wangle/futures/Try.h \ wangle/futures/WangleException.h \ wangle/futures/detail/Core.h \ - wangle/futures/detail/FSM.h + wangle/futures/detail/FSM.h \ + wangle/rx/Observable.h \ + wangle/rx/Observer.h \ + wangle/rx/Subject.h \ + wangle/rx/Subscription.h \ + wangle/rx/types.h \ + wangle/ssl/ClientHelloExtStats.h \ + wangle/ssl/DHParam.h \ + wangle/ssl/PasswordInFile.h \ + wangle/ssl/SSLCacheOptions.h \ + wangle/ssl/SSLCacheProvider.h \ + wangle/ssl/SSLContextConfig.h \ + wangle/ssl/SSLContextManager.h \ + wangle/ssl/SSLSessionCacheManager.h \ + wangle/ssl/SSLStats.h \ + wangle/ssl/SSLUtil.h \ + wangle/ssl/TLSTicketKeyManager.h \ + wangle/ssl/TLSTicketKeySeeds.h FormatTables.cpp: build/generate_format_tables.py build/generate_format_tables.py @@ -324,28 +324,28 @@ libfolly_la_SOURCES = \ TimeoutQueue.cpp \ Uri.cpp \ Version.cpp \ - wangle/futures/InlineExecutor.cpp \ - wangle/futures/ManualExecutor.cpp \ experimental/io/FsUtil.cpp \ experimental/Singleton.cpp \ experimental/TestUtil.cpp \ - experimental/wangle/concurrent/CPUThreadPoolExecutor.cpp \ - experimental/wangle/concurrent/Codel.cpp \ - experimental/wangle/concurrent/GlobalExecutor.cpp \ - experimental/wangle/concurrent/IOExecutor.cpp \ - experimental/wangle/concurrent/IOThreadPoolExecutor.cpp \ - experimental/wangle/concurrent/ThreadPoolExecutor.cpp \ - experimental/wangle/ConnectionManager.cpp \ - experimental/wangle/ManagedConnection.cpp \ - experimental/wangle/acceptor/Acceptor.cpp \ - experimental/wangle/acceptor/SocketOptions.cpp \ - experimental/wangle/acceptor/LoadShedConfiguration.cpp \ - experimental/wangle/acceptor/TransportInfo.cpp \ - experimental/wangle/ssl/PasswordInFile.cpp \ - experimental/wangle/ssl/SSLContextManager.cpp \ - experimental/wangle/ssl/SSLSessionCacheManager.cpp \ - experimental/wangle/ssl/SSLUtil.cpp \ - experimental/wangle/ssl/TLSTicketKeyManager.cpp + wangle/acceptor/Acceptor.cpp \ + wangle/acceptor/ConnectionManager.cpp \ + wangle/acceptor/LoadShedConfiguration.cpp \ + wangle/acceptor/ManagedConnection.cpp \ + wangle/acceptor/SocketOptions.cpp \ + wangle/acceptor/TransportInfo.cpp \ + wangle/concurrent/CPUThreadPoolExecutor.cpp \ + wangle/concurrent/Codel.cpp \ + wangle/concurrent/IOExecutor.cpp \ + wangle/concurrent/IOThreadPoolExecutor.cpp \ + wangle/concurrent/GlobalExecutor.cpp \ + wangle/concurrent/ThreadPoolExecutor.cpp \ + wangle/futures/InlineExecutor.cpp \ + wangle/futures/ManualExecutor.cpp \ + wangle/ssl/PasswordInFile.cpp \ + wangle/ssl/SSLContextManager.cpp \ + wangle/ssl/SSLSessionCacheManager.cpp \ + wangle/ssl/SSLUtil.cpp \ + wangle/ssl/TLSTicketKeyManager.cpp if HAVE_LINUX nobase_follyinclude_HEADERS += \ diff --git a/folly/experimental/wangle/acceptor/Acceptor.cpp b/folly/wangle/acceptor/Acceptor.cpp similarity index 98% rename from folly/experimental/wangle/acceptor/Acceptor.cpp rename to folly/wangle/acceptor/Acceptor.cpp index c3b46b07..d02ad248 100644 --- a/folly/experimental/wangle/acceptor/Acceptor.cpp +++ b/folly/wangle/acceptor/Acceptor.cpp @@ -7,15 +7,15 @@ * of patent rights can be found in the PATENTS file in the same directory. * */ -#include +#include -#include -#include +#include +#include #include #include #include -#include +#include #include #include #include diff --git a/folly/experimental/wangle/acceptor/Acceptor.h b/folly/wangle/acceptor/Acceptor.h similarity index 96% rename from folly/experimental/wangle/acceptor/Acceptor.h rename to folly/wangle/acceptor/Acceptor.h index 404425e7..9c4563ba 100644 --- a/folly/experimental/wangle/acceptor/Acceptor.h +++ b/folly/wangle/acceptor/Acceptor.h @@ -9,12 +9,12 @@ */ #pragma once -#include "folly/experimental/wangle/acceptor/ServerSocketConfig.h" -#include "folly/experimental/wangle/acceptor/ConnectionCounter.h" -#include -#include "folly/experimental/wangle/acceptor/LoadShedConfiguration.h" -#include "folly/experimental/wangle/ssl/SSLCacheProvider.h" -#include "folly/experimental/wangle/acceptor/TransportInfo.h" +#include "folly/wangle/acceptor/ServerSocketConfig.h" +#include "folly/wangle/acceptor/ConnectionCounter.h" +#include +#include "folly/wangle/acceptor/LoadShedConfiguration.h" +#include "folly/wangle/ssl/SSLCacheProvider.h" +#include "folly/wangle/acceptor/TransportInfo.h" #include #include diff --git a/folly/experimental/wangle/acceptor/ConnectionCounter.h b/folly/wangle/acceptor/ConnectionCounter.h similarity index 100% rename from folly/experimental/wangle/acceptor/ConnectionCounter.h rename to folly/wangle/acceptor/ConnectionCounter.h diff --git a/folly/experimental/wangle/ConnectionManager.cpp b/folly/wangle/acceptor/ConnectionManager.cpp similarity index 98% rename from folly/experimental/wangle/ConnectionManager.cpp rename to folly/wangle/acceptor/ConnectionManager.cpp index 8489fa08..72b1492f 100644 --- a/folly/experimental/wangle/ConnectionManager.cpp +++ b/folly/wangle/acceptor/ConnectionManager.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include #include diff --git a/folly/experimental/wangle/ConnectionManager.h b/folly/wangle/acceptor/ConnectionManager.h similarity index 99% rename from folly/experimental/wangle/ConnectionManager.h rename to folly/wangle/acceptor/ConnectionManager.h index 9ac356d6..2b0daa8d 100644 --- a/folly/experimental/wangle/ConnectionManager.h +++ b/folly/wangle/acceptor/ConnectionManager.h @@ -16,7 +16,7 @@ #pragma once -#include +#include #include #include diff --git a/folly/experimental/wangle/acceptor/DomainNameMisc.h b/folly/wangle/acceptor/DomainNameMisc.h similarity index 100% rename from folly/experimental/wangle/acceptor/DomainNameMisc.h rename to folly/wangle/acceptor/DomainNameMisc.h diff --git a/folly/experimental/wangle/acceptor/LoadShedConfiguration.cpp b/folly/wangle/acceptor/LoadShedConfiguration.cpp similarity index 94% rename from folly/experimental/wangle/acceptor/LoadShedConfiguration.cpp rename to folly/wangle/acceptor/LoadShedConfiguration.cpp index e08e71b7..191a7dce 100644 --- a/folly/experimental/wangle/acceptor/LoadShedConfiguration.cpp +++ b/folly/wangle/acceptor/LoadShedConfiguration.cpp @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. * */ -#include +#include #include #include diff --git a/folly/experimental/wangle/acceptor/LoadShedConfiguration.h b/folly/wangle/acceptor/LoadShedConfiguration.h similarity index 97% rename from folly/experimental/wangle/acceptor/LoadShedConfiguration.h rename to folly/wangle/acceptor/LoadShedConfiguration.h index 3c70b6ed..97e32027 100644 --- a/folly/experimental/wangle/acceptor/LoadShedConfiguration.h +++ b/folly/wangle/acceptor/LoadShedConfiguration.h @@ -17,7 +17,7 @@ #include #include -#include +#include namespace folly { diff --git a/folly/experimental/wangle/ManagedConnection.cpp b/folly/wangle/acceptor/ManagedConnection.cpp similarity index 92% rename from folly/experimental/wangle/ManagedConnection.cpp rename to folly/wangle/acceptor/ManagedConnection.cpp index 66db04f2..9011d598 100644 --- a/folly/experimental/wangle/ManagedConnection.cpp +++ b/folly/wangle/acceptor/ManagedConnection.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include +#include -#include +#include namespace folly { namespace wangle { diff --git a/folly/experimental/wangle/ManagedConnection.h b/folly/wangle/acceptor/ManagedConnection.h similarity index 100% rename from folly/experimental/wangle/ManagedConnection.h rename to folly/wangle/acceptor/ManagedConnection.h diff --git a/folly/experimental/wangle/acceptor/NetworkAddress.h b/folly/wangle/acceptor/NetworkAddress.h similarity index 100% rename from folly/experimental/wangle/acceptor/NetworkAddress.h rename to folly/wangle/acceptor/NetworkAddress.h diff --git a/folly/experimental/wangle/acceptor/ServerSocketConfig.h b/folly/wangle/acceptor/ServerSocketConfig.h similarity index 90% rename from folly/experimental/wangle/acceptor/ServerSocketConfig.h rename to folly/wangle/acceptor/ServerSocketConfig.h index 14dc42cb..3a722653 100644 --- a/folly/experimental/wangle/acceptor/ServerSocketConfig.h +++ b/folly/wangle/acceptor/ServerSocketConfig.h @@ -9,11 +9,11 @@ */ #pragma once -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/folly/experimental/wangle/acceptor/SocketOptions.cpp b/folly/wangle/acceptor/SocketOptions.cpp similarity index 93% rename from folly/experimental/wangle/acceptor/SocketOptions.cpp rename to folly/wangle/acceptor/SocketOptions.cpp index c7c82b88..3a159b37 100644 --- a/folly/experimental/wangle/acceptor/SocketOptions.cpp +++ b/folly/wangle/acceptor/SocketOptions.cpp @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. * */ -#include +#include #include #include diff --git a/folly/experimental/wangle/acceptor/SocketOptions.h b/folly/wangle/acceptor/SocketOptions.h similarity index 100% rename from folly/experimental/wangle/acceptor/SocketOptions.h rename to folly/wangle/acceptor/SocketOptions.h diff --git a/folly/experimental/wangle/acceptor/TransportInfo.cpp b/folly/wangle/acceptor/TransportInfo.cpp similarity index 96% rename from folly/experimental/wangle/acceptor/TransportInfo.cpp rename to folly/wangle/acceptor/TransportInfo.cpp index 02de719c..0f063b7c 100644 --- a/folly/experimental/wangle/acceptor/TransportInfo.cpp +++ b/folly/wangle/acceptor/TransportInfo.cpp @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. * */ -#include +#include #include #include diff --git a/folly/experimental/wangle/acceptor/TransportInfo.h b/folly/wangle/acceptor/TransportInfo.h similarity index 99% rename from folly/experimental/wangle/acceptor/TransportInfo.h rename to folly/wangle/acceptor/TransportInfo.h index e108c466..e11021b1 100644 --- a/folly/experimental/wangle/acceptor/TransportInfo.h +++ b/folly/wangle/acceptor/TransportInfo.h @@ -9,7 +9,7 @@ */ #pragma once -#include +#include #include #include diff --git a/folly/experimental/wangle/bootstrap/BootstrapTest.cpp b/folly/wangle/bootstrap/BootstrapTest.cpp similarity index 95% rename from folly/experimental/wangle/bootstrap/BootstrapTest.cpp rename to folly/wangle/bootstrap/BootstrapTest.cpp index 25bb75ea..6b902d20 100644 --- a/folly/experimental/wangle/bootstrap/BootstrapTest.cpp +++ b/folly/wangle/bootstrap/BootstrapTest.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "folly/experimental/wangle/bootstrap/ServerBootstrap.h" -#include "folly/experimental/wangle/bootstrap/ClientBootstrap.h" -#include "folly/experimental/wangle/channel/ChannelHandler.h" +#include "folly/wangle/bootstrap/ServerBootstrap.h" +#include "folly/wangle/bootstrap/ClientBootstrap.h" +#include "folly/wangle/channel/ChannelHandler.h" #include #include diff --git a/folly/experimental/wangle/bootstrap/ClientBootstrap.h b/folly/wangle/bootstrap/ClientBootstrap.h similarity index 95% rename from folly/experimental/wangle/bootstrap/ClientBootstrap.h rename to folly/wangle/bootstrap/ClientBootstrap.h index dadbf5c5..8ee8fad9 100644 --- a/folly/experimental/wangle/bootstrap/ClientBootstrap.h +++ b/folly/wangle/bootstrap/ClientBootstrap.h @@ -15,7 +15,7 @@ */ #pragma once -#include +#include namespace folly { diff --git a/folly/experimental/wangle/bootstrap/ServerBootstrap-inl.h b/folly/wangle/bootstrap/ServerBootstrap-inl.h similarity index 93% rename from folly/experimental/wangle/bootstrap/ServerBootstrap-inl.h rename to folly/wangle/bootstrap/ServerBootstrap-inl.h index 8db45409..a224a9f9 100644 --- a/folly/experimental/wangle/bootstrap/ServerBootstrap-inl.h +++ b/folly/wangle/bootstrap/ServerBootstrap-inl.h @@ -15,11 +15,11 @@ */ #pragma once -#include +#include #include -#include -#include -#include +#include +#include +#include namespace folly { diff --git a/folly/experimental/wangle/bootstrap/ServerBootstrap.cpp b/folly/wangle/bootstrap/ServerBootstrap.cpp similarity index 92% rename from folly/experimental/wangle/bootstrap/ServerBootstrap.cpp rename to folly/wangle/bootstrap/ServerBootstrap.cpp index 7a75452b..1f07fadf 100644 --- a/folly/experimental/wangle/bootstrap/ServerBootstrap.cpp +++ b/folly/wangle/bootstrap/ServerBootstrap.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 { diff --git a/folly/experimental/wangle/bootstrap/ServerBootstrap.h b/folly/wangle/bootstrap/ServerBootstrap.h similarity index 99% rename from folly/experimental/wangle/bootstrap/ServerBootstrap.h rename to folly/wangle/bootstrap/ServerBootstrap.h index 85edb646..f77be3fb 100644 --- a/folly/experimental/wangle/bootstrap/ServerBootstrap.h +++ b/folly/wangle/bootstrap/ServerBootstrap.h @@ -15,7 +15,7 @@ */ #pragma once -#include +#include #include namespace folly { diff --git a/folly/experimental/wangle/channel/AsyncSocketHandler.h b/folly/wangle/channel/AsyncSocketHandler.h similarity index 98% rename from folly/experimental/wangle/channel/AsyncSocketHandler.h rename to folly/wangle/channel/AsyncSocketHandler.h index 8d586d0f..eb47cb05 100644 --- a/folly/experimental/wangle/channel/AsyncSocketHandler.h +++ b/folly/wangle/channel/AsyncSocketHandler.h @@ -16,7 +16,7 @@ #pragma once -#include +#include #include #include #include diff --git a/folly/experimental/wangle/channel/ChannelHandler.h b/folly/wangle/channel/ChannelHandler.h similarity index 98% rename from folly/experimental/wangle/channel/ChannelHandler.h rename to folly/wangle/channel/ChannelHandler.h index e7fd3135..8e134a3f 100644 --- a/folly/experimental/wangle/channel/ChannelHandler.h +++ b/folly/wangle/channel/ChannelHandler.h @@ -17,7 +17,7 @@ #pragma once #include -#include +#include #include #include diff --git a/folly/experimental/wangle/channel/ChannelHandlerContext.h b/folly/wangle/channel/ChannelHandlerContext.h similarity index 100% rename from folly/experimental/wangle/channel/ChannelHandlerContext.h rename to folly/wangle/channel/ChannelHandlerContext.h diff --git a/folly/experimental/wangle/channel/ChannelPipeline.h b/folly/wangle/channel/ChannelPipeline.h similarity index 99% rename from folly/experimental/wangle/channel/ChannelPipeline.h rename to folly/wangle/channel/ChannelPipeline.h index 386caec3..07d10ba8 100644 --- a/folly/experimental/wangle/channel/ChannelPipeline.h +++ b/folly/wangle/channel/ChannelPipeline.h @@ -16,7 +16,7 @@ #pragma once -#include +#include #include #include #include diff --git a/folly/experimental/wangle/channel/OutputBufferingHandler.h b/folly/wangle/channel/OutputBufferingHandler.h similarity index 97% rename from folly/experimental/wangle/channel/OutputBufferingHandler.h rename to folly/wangle/channel/OutputBufferingHandler.h index 04d12d00..06a053d7 100644 --- a/folly/experimental/wangle/channel/OutputBufferingHandler.h +++ b/folly/wangle/channel/OutputBufferingHandler.h @@ -16,7 +16,7 @@ #pragma once -#include +#include #include #include #include diff --git a/folly/experimental/wangle/channel/test/ChannelPipelineTest.cpp b/folly/wangle/channel/test/ChannelPipelineTest.cpp similarity index 95% rename from folly/experimental/wangle/channel/test/ChannelPipelineTest.cpp rename to folly/wangle/channel/test/ChannelPipelineTest.cpp index cae1d063..a058d5b1 100644 --- a/folly/experimental/wangle/channel/test/ChannelPipelineTest.cpp +++ b/folly/wangle/channel/test/ChannelPipelineTest.cpp @@ -14,11 +14,11 @@ * limitations under the License. */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/folly/experimental/wangle/channel/test/MockChannelHandler.h b/folly/wangle/channel/test/MockChannelHandler.h similarity index 96% rename from folly/experimental/wangle/channel/test/MockChannelHandler.h rename to folly/wangle/channel/test/MockChannelHandler.h index ddf511cb..0c666d94 100644 --- a/folly/experimental/wangle/channel/test/MockChannelHandler.h +++ b/folly/wangle/channel/test/MockChannelHandler.h @@ -16,7 +16,7 @@ #pragma once -#include +#include #include namespace folly { namespace wangle { diff --git a/folly/experimental/wangle/channel/test/OutputBufferingHandlerTest.cpp b/folly/wangle/channel/test/OutputBufferingHandlerTest.cpp similarity index 90% rename from folly/experimental/wangle/channel/test/OutputBufferingHandlerTest.cpp rename to folly/wangle/channel/test/OutputBufferingHandlerTest.cpp index 600a6a85..04a705c5 100644 --- a/folly/experimental/wangle/channel/test/OutputBufferingHandlerTest.cpp +++ b/folly/wangle/channel/test/OutputBufferingHandlerTest.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/folly/experimental/wangle/concurrent/BlockingQueue.h b/folly/wangle/concurrent/BlockingQueue.h similarity index 100% rename from folly/experimental/wangle/concurrent/BlockingQueue.h rename to folly/wangle/concurrent/BlockingQueue.h diff --git a/folly/experimental/wangle/concurrent/CPUThreadPoolExecutor.cpp b/folly/wangle/concurrent/CPUThreadPoolExecutor.cpp similarity index 96% rename from folly/experimental/wangle/concurrent/CPUThreadPoolExecutor.cpp rename to folly/wangle/concurrent/CPUThreadPoolExecutor.cpp index 9caf6bee..a03c6151 100644 --- a/folly/experimental/wangle/concurrent/CPUThreadPoolExecutor.cpp +++ b/folly/wangle/concurrent/CPUThreadPoolExecutor.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include -#include +#include +#include namespace folly { namespace wangle { diff --git a/folly/experimental/wangle/concurrent/CPUThreadPoolExecutor.h b/folly/wangle/concurrent/CPUThreadPoolExecutor.h similarity index 97% rename from folly/experimental/wangle/concurrent/CPUThreadPoolExecutor.h rename to folly/wangle/concurrent/CPUThreadPoolExecutor.h index b7e88685..bc612ae6 100644 --- a/folly/experimental/wangle/concurrent/CPUThreadPoolExecutor.h +++ b/folly/wangle/concurrent/CPUThreadPoolExecutor.h @@ -16,7 +16,7 @@ #pragma once -#include +#include namespace folly { namespace wangle { diff --git a/folly/experimental/wangle/concurrent/Codel.cpp b/folly/wangle/concurrent/Codel.cpp similarity index 97% rename from folly/experimental/wangle/concurrent/Codel.cpp rename to folly/wangle/concurrent/Codel.cpp index 527058ce..b2b8cc7d 100644 --- a/folly/experimental/wangle/concurrent/Codel.cpp +++ b/folly/wangle/concurrent/Codel.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include #include diff --git a/folly/experimental/wangle/concurrent/Codel.h b/folly/wangle/concurrent/Codel.h similarity index 100% rename from folly/experimental/wangle/concurrent/Codel.h rename to folly/wangle/concurrent/Codel.h diff --git a/folly/experimental/wangle/concurrent/FutureExecutor.h b/folly/wangle/concurrent/FutureExecutor.h similarity index 100% rename from folly/experimental/wangle/concurrent/FutureExecutor.h rename to folly/wangle/concurrent/FutureExecutor.h diff --git a/folly/experimental/wangle/concurrent/GlobalExecutor.cpp b/folly/wangle/concurrent/GlobalExecutor.cpp similarity index 91% rename from folly/experimental/wangle/concurrent/GlobalExecutor.cpp rename to folly/wangle/concurrent/GlobalExecutor.cpp index b0efd4f2..e8ac292e 100644 --- a/folly/experimental/wangle/concurrent/GlobalExecutor.cpp +++ b/folly/wangle/concurrent/GlobalExecutor.cpp @@ -15,8 +15,8 @@ */ #include -#include -#include +#include +#include using namespace folly; using namespace folly::wangle; diff --git a/folly/experimental/wangle/concurrent/GlobalExecutor.h b/folly/wangle/concurrent/GlobalExecutor.h similarity index 100% rename from folly/experimental/wangle/concurrent/GlobalExecutor.h rename to folly/wangle/concurrent/GlobalExecutor.h diff --git a/folly/experimental/wangle/concurrent/IOExecutor.cpp b/folly/wangle/concurrent/IOExecutor.cpp similarity index 91% rename from folly/experimental/wangle/concurrent/IOExecutor.cpp rename to folly/wangle/concurrent/IOExecutor.cpp index d3985c99..c5c3e796 100644 --- a/folly/experimental/wangle/concurrent/IOExecutor.cpp +++ b/folly/wangle/concurrent/IOExecutor.cpp @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include #include -#include +#include using folly::Singleton; using folly::wangle::IOExecutor; diff --git a/folly/experimental/wangle/concurrent/IOExecutor.h b/folly/wangle/concurrent/IOExecutor.h similarity index 100% rename from folly/experimental/wangle/concurrent/IOExecutor.h rename to folly/wangle/concurrent/IOExecutor.h diff --git a/folly/experimental/wangle/concurrent/IOThreadPoolExecutor.cpp b/folly/wangle/concurrent/IOThreadPoolExecutor.cpp similarity index 98% rename from folly/experimental/wangle/concurrent/IOThreadPoolExecutor.cpp rename to folly/wangle/concurrent/IOThreadPoolExecutor.cpp index f1fa3904..5c97bf44 100644 --- a/folly/experimental/wangle/concurrent/IOThreadPoolExecutor.cpp +++ b/folly/wangle/concurrent/IOThreadPoolExecutor.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include #include diff --git a/folly/experimental/wangle/concurrent/IOThreadPoolExecutor.h b/folly/wangle/concurrent/IOThreadPoolExecutor.h similarity index 93% rename from folly/experimental/wangle/concurrent/IOThreadPoolExecutor.h rename to folly/wangle/concurrent/IOThreadPoolExecutor.h index 9196ef6d..7c919d1e 100644 --- a/folly/experimental/wangle/concurrent/IOThreadPoolExecutor.h +++ b/folly/wangle/concurrent/IOThreadPoolExecutor.h @@ -16,9 +16,9 @@ #pragma once -#include -#include #include +#include +#include namespace folly { namespace wangle { diff --git a/folly/experimental/wangle/concurrent/LifoSemMPMCQueue.h b/folly/wangle/concurrent/LifoSemMPMCQueue.h similarity index 95% rename from folly/experimental/wangle/concurrent/LifoSemMPMCQueue.h rename to folly/wangle/concurrent/LifoSemMPMCQueue.h index ff499991..71c2cafe 100644 --- a/folly/experimental/wangle/concurrent/LifoSemMPMCQueue.h +++ b/folly/wangle/concurrent/LifoSemMPMCQueue.h @@ -15,7 +15,7 @@ */ #pragma once -#include +#include #include #include diff --git a/folly/experimental/wangle/concurrent/NamedThreadFactory.h b/folly/wangle/concurrent/NamedThreadFactory.h similarity index 95% rename from folly/experimental/wangle/concurrent/NamedThreadFactory.h rename to folly/wangle/concurrent/NamedThreadFactory.h index 2bb5579b..2e2d27de 100644 --- a/folly/experimental/wangle/concurrent/NamedThreadFactory.h +++ b/folly/wangle/concurrent/NamedThreadFactory.h @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/folly/experimental/wangle/concurrent/PriorityLifoSemMPMCQueue.h b/folly/wangle/concurrent/PriorityLifoSemMPMCQueue.h similarity index 96% rename from folly/experimental/wangle/concurrent/PriorityLifoSemMPMCQueue.h rename to folly/wangle/concurrent/PriorityLifoSemMPMCQueue.h index 65500f58..6ee62bfb 100644 --- a/folly/experimental/wangle/concurrent/PriorityLifoSemMPMCQueue.h +++ b/folly/wangle/concurrent/PriorityLifoSemMPMCQueue.h @@ -15,7 +15,7 @@ */ #pragma once -#include +#include #include #include diff --git a/folly/experimental/wangle/concurrent/ThreadFactory.h b/folly/wangle/concurrent/ThreadFactory.h similarity index 100% rename from folly/experimental/wangle/concurrent/ThreadFactory.h rename to folly/wangle/concurrent/ThreadFactory.h diff --git a/folly/experimental/wangle/concurrent/ThreadPoolExecutor.cpp b/folly/wangle/concurrent/ThreadPoolExecutor.cpp similarity index 98% rename from folly/experimental/wangle/concurrent/ThreadPoolExecutor.cpp rename to folly/wangle/concurrent/ThreadPoolExecutor.cpp index 74890d7b..40694754 100644 --- a/folly/experimental/wangle/concurrent/ThreadPoolExecutor.cpp +++ b/folly/wangle/concurrent/ThreadPoolExecutor.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include namespace folly { namespace wangle { diff --git a/folly/experimental/wangle/concurrent/ThreadPoolExecutor.h b/folly/wangle/concurrent/ThreadPoolExecutor.h similarity index 96% rename from folly/experimental/wangle/concurrent/ThreadPoolExecutor.h rename to folly/wangle/concurrent/ThreadPoolExecutor.h index 88aa1bc7..be8f7968 100644 --- a/folly/experimental/wangle/concurrent/ThreadPoolExecutor.h +++ b/folly/wangle/concurrent/ThreadPoolExecutor.h @@ -16,9 +16,9 @@ #pragma once #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/folly/experimental/wangle/concurrent/test/CodelTest.cpp b/folly/wangle/concurrent/test/CodelTest.cpp similarity index 96% rename from folly/experimental/wangle/concurrent/test/CodelTest.cpp rename to folly/wangle/concurrent/test/CodelTest.cpp index f13dc02b..b61aded3 100644 --- a/folly/experimental/wangle/concurrent/test/CodelTest.cpp +++ b/folly/wangle/concurrent/test/CodelTest.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include diff --git a/folly/experimental/wangle/concurrent/test/GlobalExecutorTest.cpp b/folly/wangle/concurrent/test/GlobalExecutorTest.cpp similarity index 91% rename from folly/experimental/wangle/concurrent/test/GlobalExecutorTest.cpp rename to folly/wangle/concurrent/test/GlobalExecutorTest.cpp index f0f678de..a601b0c1 100644 --- a/folly/experimental/wangle/concurrent/test/GlobalExecutorTest.cpp +++ b/folly/wangle/concurrent/test/GlobalExecutorTest.cpp @@ -15,8 +15,8 @@ */ #include -#include -#include +#include +#include using namespace folly::wangle; diff --git a/folly/experimental/wangle/concurrent/test/ThreadPoolExecutorTest.cpp b/folly/wangle/concurrent/test/ThreadPoolExecutorTest.cpp similarity index 96% rename from folly/experimental/wangle/concurrent/test/ThreadPoolExecutorTest.cpp rename to folly/wangle/concurrent/test/ThreadPoolExecutorTest.cpp index 3e431073..596e2784 100644 --- a/folly/experimental/wangle/concurrent/test/ThreadPoolExecutorTest.cpp +++ b/folly/wangle/concurrent/test/ThreadPoolExecutorTest.cpp @@ -14,10 +14,10 @@ * limitations under the License. */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/folly/experimental/wangle/rx/Dummy.cpp b/folly/wangle/rx/Dummy.cpp similarity index 100% rename from folly/experimental/wangle/rx/Dummy.cpp rename to folly/wangle/rx/Dummy.cpp diff --git a/folly/experimental/wangle/rx/Observable.h b/folly/wangle/rx/Observable.h similarity index 98% rename from folly/experimental/wangle/rx/Observable.h rename to folly/wangle/rx/Observable.h index e9a6196e..b9db2f15 100644 --- a/folly/experimental/wangle/rx/Observable.h +++ b/folly/wangle/rx/Observable.h @@ -16,9 +16,9 @@ #pragma once -#include -#include -#include +#include +#include +#include #include #include diff --git a/folly/experimental/wangle/rx/Observer.h b/folly/wangle/rx/Observer.h similarity index 98% rename from folly/experimental/wangle/rx/Observer.h rename to folly/wangle/rx/Observer.h index cfe49dd9..b0babce9 100644 --- a/folly/experimental/wangle/rx/Observer.h +++ b/folly/wangle/rx/Observer.h @@ -16,7 +16,7 @@ #pragma once -#include +#include #include #include #include diff --git a/folly/experimental/wangle/rx/README b/folly/wangle/rx/README similarity index 100% rename from folly/experimental/wangle/rx/README rename to folly/wangle/rx/README diff --git a/folly/experimental/wangle/rx/Subject.h b/folly/wangle/rx/Subject.h similarity index 92% rename from folly/experimental/wangle/rx/Subject.h rename to folly/wangle/rx/Subject.h index 6ff04c0e..8717bdd4 100644 --- a/folly/experimental/wangle/rx/Subject.h +++ b/folly/wangle/rx/Subject.h @@ -16,8 +16,8 @@ #pragma once -#include -#include +#include +#include namespace folly { namespace wangle { diff --git a/folly/experimental/wangle/rx/Subscription.h b/folly/wangle/rx/Subscription.h similarity index 96% rename from folly/experimental/wangle/rx/Subscription.h rename to folly/wangle/rx/Subscription.h index 7c058e23..d9885b43 100644 --- a/folly/experimental/wangle/rx/Subscription.h +++ b/folly/wangle/rx/Subscription.h @@ -16,7 +16,7 @@ #pragma once -#include +#include namespace folly { namespace wangle { diff --git a/folly/experimental/wangle/rx/test/RxBenchmark.cpp b/folly/wangle/rx/test/RxBenchmark.cpp similarity index 97% rename from folly/experimental/wangle/rx/test/RxBenchmark.cpp rename to folly/wangle/rx/test/RxBenchmark.cpp index c4123100..5e3a7188 100644 --- a/folly/experimental/wangle/rx/test/RxBenchmark.cpp +++ b/folly/wangle/rx/test/RxBenchmark.cpp @@ -15,8 +15,8 @@ */ #include -#include -#include +#include +#include #include using namespace folly::wangle; diff --git a/folly/experimental/wangle/rx/test/RxTest.cpp b/folly/wangle/rx/test/RxTest.cpp similarity index 98% rename from folly/experimental/wangle/rx/test/RxTest.cpp rename to folly/wangle/rx/test/RxTest.cpp index 8cf2605d..d2003fcf 100644 --- a/folly/experimental/wangle/rx/test/RxTest.cpp +++ b/folly/wangle/rx/test/RxTest.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include -#include +#include +#include #include using namespace folly::wangle; diff --git a/folly/experimental/wangle/rx/types.h b/folly/wangle/rx/types.h similarity index 100% rename from folly/experimental/wangle/rx/types.h rename to folly/wangle/rx/types.h diff --git a/folly/experimental/wangle/ssl/ClientHelloExtStats.h b/folly/wangle/ssl/ClientHelloExtStats.h similarity index 100% rename from folly/experimental/wangle/ssl/ClientHelloExtStats.h rename to folly/wangle/ssl/ClientHelloExtStats.h diff --git a/folly/experimental/wangle/ssl/DHParam.h b/folly/wangle/ssl/DHParam.h similarity index 100% rename from folly/experimental/wangle/ssl/DHParam.h rename to folly/wangle/ssl/DHParam.h diff --git a/folly/experimental/wangle/ssl/PasswordInFile.cpp b/folly/wangle/ssl/PasswordInFile.cpp similarity index 92% rename from folly/experimental/wangle/ssl/PasswordInFile.cpp rename to folly/wangle/ssl/PasswordInFile.cpp index c876c39d..77ec6235 100644 --- a/folly/experimental/wangle/ssl/PasswordInFile.cpp +++ b/folly/wangle/ssl/PasswordInFile.cpp @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. * */ -#include +#include #include diff --git a/folly/experimental/wangle/ssl/PasswordInFile.h b/folly/wangle/ssl/PasswordInFile.h similarity index 100% rename from folly/experimental/wangle/ssl/PasswordInFile.h rename to folly/wangle/ssl/PasswordInFile.h diff --git a/folly/experimental/wangle/ssl/SSLCacheOptions.h b/folly/wangle/ssl/SSLCacheOptions.h similarity index 100% rename from folly/experimental/wangle/ssl/SSLCacheOptions.h rename to folly/wangle/ssl/SSLCacheOptions.h diff --git a/folly/experimental/wangle/ssl/SSLCacheProvider.h b/folly/wangle/ssl/SSLCacheProvider.h similarity index 100% rename from folly/experimental/wangle/ssl/SSLCacheProvider.h rename to folly/wangle/ssl/SSLCacheProvider.h diff --git a/folly/experimental/wangle/ssl/SSLContextConfig.h b/folly/wangle/ssl/SSLContextConfig.h similarity index 100% rename from folly/experimental/wangle/ssl/SSLContextConfig.h rename to folly/wangle/ssl/SSLContextConfig.h diff --git a/folly/experimental/wangle/ssl/SSLContextManager.cpp b/folly/wangle/ssl/SSLContextManager.cpp similarity index 97% rename from folly/experimental/wangle/ssl/SSLContextManager.cpp rename to folly/wangle/ssl/SSLContextManager.cpp index eb9f1266..eb90ef3a 100644 --- a/folly/experimental/wangle/ssl/SSLContextManager.cpp +++ b/folly/wangle/ssl/SSLContextManager.cpp @@ -7,16 +7,16 @@ * of patent rights can be found in the PATENTS file in the same directory. * */ -#include - -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/folly/experimental/wangle/ssl/SSLContextManager.h b/folly/wangle/ssl/SSLContextManager.h similarity index 95% rename from folly/experimental/wangle/ssl/SSLContextManager.h rename to folly/wangle/ssl/SSLContextManager.h index 26506493..9c55231b 100644 --- a/folly/experimental/wangle/ssl/SSLContextManager.h +++ b/folly/wangle/ssl/SSLContextManager.h @@ -15,10 +15,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include namespace folly { diff --git a/folly/experimental/wangle/ssl/SSLSessionCacheManager.cpp b/folly/wangle/ssl/SSLSessionCacheManager.cpp similarity index 98% rename from folly/experimental/wangle/ssl/SSLSessionCacheManager.cpp rename to folly/wangle/ssl/SSLSessionCacheManager.cpp index e9111b6b..ec8ccb2d 100644 --- a/folly/experimental/wangle/ssl/SSLSessionCacheManager.cpp +++ b/folly/wangle/ssl/SSLSessionCacheManager.cpp @@ -7,11 +7,11 @@ * of patent rights can be found in the PATENTS file in the same directory. * */ -#include +#include -#include -#include -#include +#include +#include +#include #include diff --git a/folly/experimental/wangle/ssl/SSLSessionCacheManager.h b/folly/wangle/ssl/SSLSessionCacheManager.h similarity index 98% rename from folly/experimental/wangle/ssl/SSLSessionCacheManager.h rename to folly/wangle/ssl/SSLSessionCacheManager.h index f9c9e5de..4b1e55c1 100644 --- a/folly/experimental/wangle/ssl/SSLSessionCacheManager.h +++ b/folly/wangle/ssl/SSLSessionCacheManager.h @@ -9,8 +9,8 @@ */ #pragma once -#include -#include +#include +#include #include #include diff --git a/folly/experimental/wangle/ssl/SSLStats.h b/folly/wangle/ssl/SSLStats.h similarity index 100% rename from folly/experimental/wangle/ssl/SSLStats.h rename to folly/wangle/ssl/SSLStats.h diff --git a/folly/experimental/wangle/ssl/SSLUtil.cpp b/folly/wangle/ssl/SSLUtil.cpp similarity index 97% rename from folly/experimental/wangle/ssl/SSLUtil.cpp rename to folly/wangle/ssl/SSLUtil.cpp index 5557d1e4..85056856 100644 --- a/folly/experimental/wangle/ssl/SSLUtil.cpp +++ b/folly/wangle/ssl/SSLUtil.cpp @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. * */ -#include +#include #include diff --git a/folly/experimental/wangle/ssl/SSLUtil.h b/folly/wangle/ssl/SSLUtil.h similarity index 100% rename from folly/experimental/wangle/ssl/SSLUtil.h rename to folly/wangle/ssl/SSLUtil.h diff --git a/folly/experimental/wangle/ssl/TLSTicketKeyManager.cpp b/folly/wangle/ssl/TLSTicketKeyManager.cpp similarity index 98% rename from folly/experimental/wangle/ssl/TLSTicketKeyManager.cpp rename to folly/wangle/ssl/TLSTicketKeyManager.cpp index c02153a5..1f74add6 100644 --- a/folly/experimental/wangle/ssl/TLSTicketKeyManager.cpp +++ b/folly/wangle/ssl/TLSTicketKeyManager.cpp @@ -7,10 +7,10 @@ * of patent rights can be found in the PATENTS file in the same directory. * */ -#include +#include -#include -#include +#include +#include #include #include diff --git a/folly/experimental/wangle/ssl/TLSTicketKeyManager.h b/folly/wangle/ssl/TLSTicketKeyManager.h similarity index 100% rename from folly/experimental/wangle/ssl/TLSTicketKeyManager.h rename to folly/wangle/ssl/TLSTicketKeyManager.h diff --git a/folly/experimental/wangle/ssl/TLSTicketKeySeeds.h b/folly/wangle/ssl/TLSTicketKeySeeds.h similarity index 100% rename from folly/experimental/wangle/ssl/TLSTicketKeySeeds.h rename to folly/wangle/ssl/TLSTicketKeySeeds.h diff --git a/folly/experimental/wangle/ssl/test/SSLCacheTest.cpp b/folly/wangle/ssl/test/SSLCacheTest.cpp similarity index 100% rename from folly/experimental/wangle/ssl/test/SSLCacheTest.cpp rename to folly/wangle/ssl/test/SSLCacheTest.cpp diff --git a/folly/experimental/wangle/ssl/test/SSLContextManagerTest.cpp b/folly/wangle/ssl/test/SSLContextManagerTest.cpp similarity index 95% rename from folly/experimental/wangle/ssl/test/SSLContextManagerTest.cpp rename to folly/wangle/ssl/test/SSLContextManagerTest.cpp index 6e5815c0..3dd9b29e 100644 --- a/folly/experimental/wangle/ssl/test/SSLContextManagerTest.cpp +++ b/folly/wangle/ssl/test/SSLContextManagerTest.cpp @@ -11,8 +11,8 @@ #include #include #include -#include -#include +#include +#include using std::shared_ptr; -- 2.34.1