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

@@ -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 += \

folly/experimental/wangle/acceptor/Acceptor.cpp → folly/wangle/acceptor/Acceptor.cpp

@@ -7,15 +7,15 @@
  *  of patent rights can be found in the PATENTS file in the same directory.
  *
  */
-#include <folly/experimental/wangle/acceptor/Acceptor.h>
+#include <folly/wangle/acceptor/Acceptor.h>
 
-#include <folly/experimental/wangle/ManagedConnection.h>
-#include <folly/experimental/wangle/ssl/SSLContextManager.h>
+#include <folly/wangle/acceptor/ManagedConnection.h>
+#include <folly/wangle/ssl/SSLContextManager.h>
 
 #include <boost/cast.hpp>
 #include <fcntl.h>
 #include <folly/ScopeGuard.h>
-#include <folly/experimental/wangle/ManagedConnection.h>
+#include <folly/wangle/acceptor/ManagedConnection.h>
 #include <folly/io/async/EventBase.h>
 #include <fstream>
 #include <sys/socket.h>

folly/experimental/wangle/acceptor/Acceptor.h → 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 <folly/experimental/wangle/ConnectionManager.h>
-#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 <folly/wangle/acceptor/ConnectionManager.h>
+#include "folly/wangle/acceptor/LoadShedConfiguration.h"
+#include "folly/wangle/ssl/SSLCacheProvider.h"
+#include "folly/wangle/acceptor/TransportInfo.h"
 
 #include <chrono>
 #include <event.h>

folly/experimental/wangle/ConnectionManager.cpp → folly/wangle/acceptor/ConnectionManager.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <folly/experimental/wangle/ConnectionManager.h>
+#include <folly/wangle/acceptor/ConnectionManager.h>
 
 #include <glog/logging.h>
 #include <folly/io/async/EventBase.h>

folly/experimental/wangle/ConnectionManager.h → folly/wangle/acceptor/ConnectionManager.h

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <folly/experimental/wangle/ManagedConnection.h>
+#include <folly/wangle/acceptor/ManagedConnection.h>
 
 #include <chrono>
 #include <folly/Memory.h>

folly/experimental/wangle/acceptor/LoadShedConfiguration.cpp → folly/wangle/acceptor/LoadShedConfiguration.cpp

@@ -7,7 +7,7 @@
  *  of patent rights can be found in the PATENTS file in the same directory.
  *
  */
-#include <folly/experimental/wangle/acceptor/LoadShedConfiguration.h>
+#include <folly/wangle/acceptor/LoadShedConfiguration.h>
 
 #include <folly/Conv.h>
 #include <openssl/ssl.h>

folly/experimental/wangle/acceptor/LoadShedConfiguration.h → folly/wangle/acceptor/LoadShedConfiguration.h

@@ -17,7 +17,7 @@
 #include <set>
 #include <string>
 
-#include <folly/experimental/wangle/acceptor/NetworkAddress.h>
+#include <folly/wangle/acceptor/NetworkAddress.h>
 
 namespace folly {
 

folly/experimental/wangle/ManagedConnection.cpp → folly/wangle/acceptor/ManagedConnection.cpp

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <folly/experimental/wangle/ManagedConnection.h>
+#include <folly/wangle/acceptor/ManagedConnection.h>
 
-#include <folly/experimental/wangle/ConnectionManager.h>
+#include <folly/wangle/acceptor/ConnectionManager.h>
 
 namespace folly { namespace wangle {
 

folly/experimental/wangle/acceptor/ServerSocketConfig.h → folly/wangle/acceptor/ServerSocketConfig.h

@@ -9,11 +9,11 @@
  */
 #pragma once
 
-#include <folly/experimental/wangle/ssl/SSLCacheOptions.h>
-#include <folly/experimental/wangle/ssl/SSLContextConfig.h>
-#include <folly/experimental/wangle/ssl/TLSTicketKeySeeds.h>
-#include <folly/experimental/wangle/ssl/SSLUtil.h>
-#include <folly/experimental/wangle/acceptor/SocketOptions.h>
+#include <folly/wangle/ssl/SSLCacheOptions.h>
+#include <folly/wangle/ssl/SSLContextConfig.h>
+#include <folly/wangle/ssl/TLSTicketKeySeeds.h>
+#include <folly/wangle/ssl/SSLUtil.h>
+#include <folly/wangle/acceptor/SocketOptions.h>
 
 #include <boost/optional.hpp>
 #include <chrono>

folly/experimental/wangle/acceptor/SocketOptions.cpp → folly/wangle/acceptor/SocketOptions.cpp

@@ -7,7 +7,7 @@
  *  of patent rights can be found in the PATENTS file in the same directory.
  *
  */
-#include <folly/experimental/wangle/acceptor/SocketOptions.h>
+#include <folly/wangle/acceptor/SocketOptions.h>
 
 #include <netinet/tcp.h>
 #include <sys/socket.h>

folly/experimental/wangle/acceptor/TransportInfo.cpp → folly/wangle/acceptor/TransportInfo.cpp

@@ -7,7 +7,7 @@
  *  of patent rights can be found in the PATENTS file in the same directory.
  *
  */
-#include <folly/experimental/wangle/acceptor/TransportInfo.h>
+#include <folly/wangle/acceptor/TransportInfo.h>
 
 #include <sys/socket.h>
 #include <sys/types.h>

folly/experimental/wangle/acceptor/TransportInfo.h → folly/wangle/acceptor/TransportInfo.h

@@ -9,7 +9,7 @@
  */
 #pragma once
 
-#include <folly/experimental/wangle/ssl/SSLUtil.h>
+#include <folly/wangle/ssl/SSLUtil.h>
 
 #include <chrono>
 #include <netinet/tcp.h>

folly/experimental/wangle/bootstrap/BootstrapTest.cpp → 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 <glog/logging.h>
 #include <gtest/gtest.h>

folly/experimental/wangle/bootstrap/ClientBootstrap.h → folly/wangle/bootstrap/ClientBootstrap.h

@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include <folly/experimental/wangle/channel/ChannelPipeline.h>
+#include <folly/wangle/channel/ChannelPipeline.h>
 
 namespace folly {
 

folly/experimental/wangle/bootstrap/ServerBootstrap-inl.h → folly/wangle/bootstrap/ServerBootstrap-inl.h

@@ -15,11 +15,11 @@
  */
 #pragma once
 
-#include <folly/experimental/wangle/acceptor/Acceptor.h>
+#include <folly/wangle/acceptor/Acceptor.h>
 #include <folly/io/async/EventBaseManager.h>
-#include <folly/experimental/wangle/concurrent/IOThreadPoolExecutor.h>
-#include <folly/experimental/wangle/ManagedConnection.h>
-#include <folly/experimental/wangle/channel/ChannelPipeline.h>
+#include <folly/wangle/concurrent/IOThreadPoolExecutor.h>
+#include <folly/wangle/acceptor/ManagedConnection.h>
+#include <folly/wangle/channel/ChannelPipeline.h>
 
 namespace folly {
 

folly/experimental/wangle/bootstrap/ServerBootstrap.cpp → folly/wangle/bootstrap/ServerBootstrap.cpp

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <folly/experimental/wangle/bootstrap/ServerBootstrap.h>
-#include <folly/experimental/wangle/concurrent/NamedThreadFactory.h>
+#include <folly/wangle/bootstrap/ServerBootstrap.h>
+#include <folly/wangle/concurrent/NamedThreadFactory.h>
 #include <folly/io/async/EventBaseManager.h>
 
 namespace folly {

folly/experimental/wangle/bootstrap/ServerBootstrap.h → folly/wangle/bootstrap/ServerBootstrap.h

@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include <folly/experimental/wangle/bootstrap/ServerBootstrap-inl.h>
+#include <folly/wangle/bootstrap/ServerBootstrap-inl.h>
 #include <boost/thread.hpp>
 
 namespace folly {

folly/experimental/wangle/channel/AsyncSocketHandler.h → folly/wangle/channel/AsyncSocketHandler.h

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <folly/experimental/wangle/channel/ChannelHandler.h>
+#include <folly/wangle/channel/ChannelHandler.h>
 #include <folly/io/async/AsyncSocket.h>
 #include <folly/io/async/EventBase.h>
 #include <folly/io/async/EventBaseManager.h>

folly/experimental/wangle/channel/ChannelHandler.h → folly/wangle/channel/ChannelHandler.h

@@ -17,7 +17,7 @@
 #pragma once
 
 #include <folly/wangle/futures/Future.h>
-#include <folly/experimental/wangle/channel/ChannelPipeline.h>
+#include <folly/wangle/channel/ChannelPipeline.h>
 #include <folly/io/IOBuf.h>
 #include <folly/io/IOBufQueue.h>
 

folly/experimental/wangle/channel/ChannelPipeline.h → folly/wangle/channel/ChannelPipeline.h

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <folly/experimental/wangle/channel/ChannelHandlerContext.h>
+#include <folly/wangle/channel/ChannelHandlerContext.h>
 #include <folly/wangle/futures/Future.h>
 #include <folly/io/async/AsyncTransport.h>
 #include <folly/io/async/DelayedDestruction.h>

folly/experimental/wangle/channel/OutputBufferingHandler.h → folly/wangle/channel/OutputBufferingHandler.h

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <folly/experimental/wangle/channel/ChannelHandler.h>
+#include <folly/wangle/channel/ChannelHandler.h>
 #include <folly/io/async/EventBase.h>
 #include <folly/io/async/EventBaseManager.h>
 #include <folly/io/IOBuf.h>

folly/experimental/wangle/channel/test/ChannelPipelineTest.cpp → folly/wangle/channel/test/ChannelPipelineTest.cpp

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <folly/experimental/wangle/channel/ChannelHandler.h>
-#include <folly/experimental/wangle/channel/ChannelPipeline.h>
-#include <folly/experimental/wangle/channel/AsyncSocketHandler.h>
-#include <folly/experimental/wangle/channel/OutputBufferingHandler.h>
-#include <folly/experimental/wangle/channel/test/MockChannelHandler.h>
+#include <folly/wangle/channel/ChannelHandler.h>
+#include <folly/wangle/channel/ChannelPipeline.h>
+#include <folly/wangle/channel/AsyncSocketHandler.h>
+#include <folly/wangle/channel/OutputBufferingHandler.h>
+#include <folly/wangle/channel/test/MockChannelHandler.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 

folly/experimental/wangle/channel/test/MockChannelHandler.h → folly/wangle/channel/test/MockChannelHandler.h

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <folly/experimental/wangle/channel/ChannelHandler.h>
+#include <folly/wangle/channel/ChannelHandler.h>
 #include <gmock/gmock.h>
 
 namespace folly { namespace wangle {

folly/experimental/wangle/channel/test/OutputBufferingHandlerTest.cpp → folly/wangle/channel/test/OutputBufferingHandlerTest.cpp

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <folly/experimental/wangle/channel/ChannelPipeline.h>
-#include <folly/experimental/wangle/channel/OutputBufferingHandler.h>
-#include <folly/experimental/wangle/channel/test/MockChannelHandler.h>
+#include <folly/wangle/channel/ChannelPipeline.h>
+#include <folly/wangle/channel/OutputBufferingHandler.h>
+#include <folly/wangle/channel/test/MockChannelHandler.h>
 #include <folly/io/async/AsyncSocket.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>

folly/experimental/wangle/concurrent/CPUThreadPoolExecutor.cpp → folly/wangle/concurrent/CPUThreadPoolExecutor.cpp

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <folly/experimental/wangle/concurrent/CPUThreadPoolExecutor.h>
-#include <folly/experimental/wangle/concurrent/PriorityLifoSemMPMCQueue.h>
+#include <folly/wangle/concurrent/CPUThreadPoolExecutor.h>
+#include <folly/wangle/concurrent/PriorityLifoSemMPMCQueue.h>
 
 namespace folly { namespace wangle {
 

folly/experimental/wangle/concurrent/CPUThreadPoolExecutor.h → folly/wangle/concurrent/CPUThreadPoolExecutor.h

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <folly/experimental/wangle/concurrent/ThreadPoolExecutor.h>
+#include <folly/wangle/concurrent/ThreadPoolExecutor.h>
 
 namespace folly { namespace wangle {
 

folly/experimental/wangle/concurrent/Codel.cpp → folly/wangle/concurrent/Codel.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <folly/experimental/wangle/concurrent/Codel.h>
+#include <folly/wangle/concurrent/Codel.h>
 #include <algorithm>
 #include <math.h>
 

folly/experimental/wangle/concurrent/GlobalExecutor.cpp → folly/wangle/concurrent/GlobalExecutor.cpp

@@ -15,8 +15,8 @@
  */
 
 #include <folly/experimental/Singleton.h>
-#include <folly/experimental/wangle/concurrent/IOExecutor.h>
-#include <folly/experimental/wangle/concurrent/IOThreadPoolExecutor.h>
+#include <folly/wangle/concurrent/IOExecutor.h>
+#include <folly/wangle/concurrent/IOThreadPoolExecutor.h>
 
 using namespace folly;
 using namespace folly::wangle;

folly/experimental/wangle/concurrent/IOExecutor.cpp → folly/wangle/concurrent/IOExecutor.cpp

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <folly/experimental/wangle/concurrent/IOExecutor.h>
+#include <folly/wangle/concurrent/IOExecutor.h>
 
 #include <folly/experimental/Singleton.h>
-#include <folly/experimental/wangle/concurrent/GlobalExecutor.h>
+#include <folly/wangle/concurrent/GlobalExecutor.h>
 
 using folly::Singleton;
 using folly::wangle::IOExecutor;

folly/experimental/wangle/concurrent/IOThreadPoolExecutor.cpp → folly/wangle/concurrent/IOThreadPoolExecutor.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <folly/experimental/wangle/concurrent/IOThreadPoolExecutor.h>
+#include <folly/wangle/concurrent/IOThreadPoolExecutor.h>
 
 #include <folly/MoveWrapper.h>
 #include <glog/logging.h>

folly/experimental/wangle/concurrent/IOThreadPoolExecutor.h → folly/wangle/concurrent/IOThreadPoolExecutor.h

@@ -16,9 +16,9 @@
 
 #pragma once
 
-#include <folly/experimental/wangle/concurrent/IOExecutor.h>
-#include <folly/experimental/wangle/concurrent/ThreadPoolExecutor.h>
 #include <folly/io/async/EventBase.h>
+#include <folly/wangle/concurrent/IOExecutor.h>
+#include <folly/wangle/concurrent/ThreadPoolExecutor.h>
 
 namespace folly { namespace wangle {
 

folly/experimental/wangle/concurrent/LifoSemMPMCQueue.h → folly/wangle/concurrent/LifoSemMPMCQueue.h

@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include <folly/experimental/wangle/concurrent/BlockingQueue.h>
+#include <folly/wangle/concurrent/BlockingQueue.h>
 #include <folly/LifoSem.h>
 #include <folly/MPMCQueue.h>
 

folly/experimental/wangle/concurrent/NamedThreadFactory.h → folly/wangle/concurrent/NamedThreadFactory.h

@@ -20,7 +20,7 @@
 #include <string>
 #include <thread>
 
-#include <folly/experimental/wangle/concurrent/ThreadFactory.h>
+#include <folly/wangle/concurrent/ThreadFactory.h>
 #include <folly/Conv.h>
 #include <folly/Range.h>
 #include <folly/ThreadName.h>

folly/experimental/wangle/concurrent/PriorityLifoSemMPMCQueue.h → folly/wangle/concurrent/PriorityLifoSemMPMCQueue.h

@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include <folly/experimental/wangle/concurrent/BlockingQueue.h>
+#include <folly/wangle/concurrent/BlockingQueue.h>
 #include <folly/LifoSem.h>
 #include <folly/MPMCQueue.h>
 

folly/experimental/wangle/concurrent/ThreadPoolExecutor.cpp → folly/wangle/concurrent/ThreadPoolExecutor.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <folly/experimental/wangle/concurrent/ThreadPoolExecutor.h>
+#include <folly/wangle/concurrent/ThreadPoolExecutor.h>
 
 namespace folly { namespace wangle {
 

folly/experimental/wangle/concurrent/ThreadPoolExecutor.h → folly/wangle/concurrent/ThreadPoolExecutor.h

@@ -16,9 +16,9 @@
 
 #pragma once
 #include <folly/Executor.h>
-#include <folly/experimental/wangle/concurrent/LifoSemMPMCQueue.h>
-#include <folly/experimental/wangle/concurrent/NamedThreadFactory.h>
-#include <folly/experimental/wangle/rx/Observable.h>
+#include <folly/wangle/concurrent/LifoSemMPMCQueue.h>
+#include <folly/wangle/concurrent/NamedThreadFactory.h>
+#include <folly/wangle/rx/Observable.h>
 #include <folly/Baton.h>
 #include <folly/Memory.h>
 #include <folly/RWSpinLock.h>

folly/experimental/wangle/concurrent/test/CodelTest.cpp → folly/wangle/concurrent/test/CodelTest.cpp

@@ -15,7 +15,7 @@
  */
 
 #include <chrono>
-#include <folly/experimental/wangle/concurrent/Codel.h>
+#include <folly/wangle/concurrent/Codel.h>
 #include <gtest/gtest.h>
 #include <thread>
 

folly/experimental/wangle/concurrent/test/GlobalExecutorTest.cpp → folly/wangle/concurrent/test/GlobalExecutorTest.cpp

@@ -15,8 +15,8 @@
  */
 
 #include <gtest/gtest.h>
-#include <folly/experimental/wangle/concurrent/GlobalExecutor.h>
-#include <folly/experimental/wangle/concurrent/IOExecutor.h>
+#include <folly/wangle/concurrent/GlobalExecutor.h>
+#include <folly/wangle/concurrent/IOExecutor.h>
 
 using namespace folly::wangle;
 

folly/experimental/wangle/concurrent/test/ThreadPoolExecutorTest.cpp → folly/wangle/concurrent/test/ThreadPoolExecutorTest.cpp

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include <folly/experimental/wangle/concurrent/FutureExecutor.h>
-#include <folly/experimental/wangle/concurrent/ThreadPoolExecutor.h>
-#include <folly/experimental/wangle/concurrent/CPUThreadPoolExecutor.h>
-#include <folly/experimental/wangle/concurrent/IOThreadPoolExecutor.h>
+#include <folly/wangle/concurrent/FutureExecutor.h>
+#include <folly/wangle/concurrent/ThreadPoolExecutor.h>
+#include <folly/wangle/concurrent/CPUThreadPoolExecutor.h>
+#include <folly/wangle/concurrent/IOThreadPoolExecutor.h>
 #include <glog/logging.h>
 #include <gtest/gtest.h>
 

folly/experimental/wangle/rx/Observable.h → folly/wangle/rx/Observable.h

@@ -16,9 +16,9 @@
 
 #pragma once
 
-#include <folly/experimental/wangle/rx/Subject.h>
-#include <folly/experimental/wangle/rx/Subscription.h>
-#include <folly/experimental/wangle/rx/types.h>
+#include <folly/wangle/rx/Subject.h>
+#include <folly/wangle/rx/Subscription.h>
+#include <folly/wangle/rx/types.h>
 
 #include <folly/RWSpinLock.h>
 #include <folly/SmallLocks.h>

folly/experimental/wangle/rx/Observer.h → folly/wangle/rx/Observer.h

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <folly/experimental/wangle/rx/types.h>
+#include <folly/wangle/rx/types.h>
 #include <functional>
 #include <memory>
 #include <stdexcept>

folly/experimental/wangle/rx/Subject.h → folly/wangle/rx/Subject.h

@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <folly/experimental/wangle/rx/Observable.h>
-#include <folly/experimental/wangle/rx/Observer.h>
+#include <folly/wangle/rx/Observable.h>
+#include <folly/wangle/rx/Observer.h>
 
 namespace folly { namespace wangle {
 

folly/experimental/wangle/rx/Subscription.h → folly/wangle/rx/Subscription.h

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <folly/experimental/wangle/rx/Observable.h>
+#include <folly/wangle/rx/Observable.h>
 
 namespace folly { namespace wangle {
 

folly/experimental/wangle/rx/test/RxBenchmark.cpp → folly/wangle/rx/test/RxBenchmark.cpp

@@ -15,8 +15,8 @@
  */
 
 #include <folly/Benchmark.h>
-#include <folly/experimental/wangle/rx/Observer.h>
-#include <folly/experimental/wangle/rx/Subject.h>
+#include <folly/wangle/rx/Observer.h>
+#include <folly/wangle/rx/Subject.h>
 #include <gflags/gflags.h>
 
 using namespace folly::wangle;

folly/experimental/wangle/rx/test/RxTest.cpp → folly/wangle/rx/test/RxTest.cpp

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <folly/experimental/wangle/rx/Observer.h>
-#include <folly/experimental/wangle/rx/Subject.h>
+#include <folly/wangle/rx/Observer.h>
+#include <folly/wangle/rx/Subject.h>
 #include <gtest/gtest.h>
 
 using namespace folly::wangle;

folly/experimental/wangle/ssl/PasswordInFile.cpp → folly/wangle/ssl/PasswordInFile.cpp

@@ -7,7 +7,7 @@
  *  of patent rights can be found in the PATENTS file in the same directory.
  *
  */
-#include <folly/experimental/wangle/ssl/PasswordInFile.h>
+#include <folly/wangle/ssl/PasswordInFile.h>
 
 #include <folly/FileUtil.h>
 

folly/experimental/wangle/ssl/SSLContextManager.cpp → folly/wangle/ssl/SSLContextManager.cpp

@@ -7,16 +7,16 @@
  *  of patent rights can be found in the PATENTS file in the same directory.
  *
  */
-#include <folly/experimental/wangle/ssl/SSLContextManager.h>
-
-#include <folly/experimental/wangle/ssl/ClientHelloExtStats.h>
-#include <folly/experimental/wangle/ssl/DHParam.h>
-#include <folly/experimental/wangle/ssl/PasswordInFile.h>
-#include <folly/experimental/wangle/ssl/SSLCacheOptions.h>
-#include <folly/experimental/wangle/ssl/SSLSessionCacheManager.h>
-#include <folly/experimental/wangle/ssl/SSLUtil.h>
-#include <folly/experimental/wangle/ssl/TLSTicketKeyManager.h>
-#include <folly/experimental/wangle/ssl/TLSTicketKeySeeds.h>
+#include <folly/wangle/ssl/SSLContextManager.h>
+
+#include <folly/wangle/ssl/ClientHelloExtStats.h>
+#include <folly/wangle/ssl/DHParam.h>
+#include <folly/wangle/ssl/PasswordInFile.h>
+#include <folly/wangle/ssl/SSLCacheOptions.h>
+#include <folly/wangle/ssl/SSLSessionCacheManager.h>
+#include <folly/wangle/ssl/SSLUtil.h>
+#include <folly/wangle/ssl/TLSTicketKeyManager.h>
+#include <folly/wangle/ssl/TLSTicketKeySeeds.h>
 
 #include <folly/Conv.h>
 #include <folly/ScopeGuard.h>

folly/experimental/wangle/ssl/SSLContextManager.h → folly/wangle/ssl/SSLContextManager.h

@@ -15,10 +15,10 @@
 #include <glog/logging.h>
 #include <list>
 #include <memory>
-#include <folly/experimental/wangle/ssl/SSLContextConfig.h>
-#include <folly/experimental/wangle/ssl/SSLSessionCacheManager.h>
-#include <folly/experimental/wangle/ssl/TLSTicketKeySeeds.h>
-#include <folly/experimental/wangle/acceptor/DomainNameMisc.h>
+#include <folly/wangle/ssl/SSLContextConfig.h>
+#include <folly/wangle/ssl/SSLSessionCacheManager.h>
+#include <folly/wangle/ssl/TLSTicketKeySeeds.h>
+#include <folly/wangle/acceptor/DomainNameMisc.h>
 #include <vector>
 
 namespace folly {

folly/experimental/wangle/ssl/SSLSessionCacheManager.cpp → folly/wangle/ssl/SSLSessionCacheManager.cpp

@@ -7,11 +7,11 @@
  *  of patent rights can be found in the PATENTS file in the same directory.
  *
  */
-#include <folly/experimental/wangle/ssl/SSLSessionCacheManager.h>
+#include <folly/wangle/ssl/SSLSessionCacheManager.h>
 
-#include <folly/experimental/wangle/ssl/SSLCacheProvider.h>
-#include <folly/experimental/wangle/ssl/SSLStats.h>
-#include <folly/experimental/wangle/ssl/SSLUtil.h>
+#include <folly/wangle/ssl/SSLCacheProvider.h>
+#include <folly/wangle/ssl/SSLStats.h>
+#include <folly/wangle/ssl/SSLUtil.h>
 
 #include <folly/io/async/EventBase.h>
 

folly/experimental/wangle/ssl/SSLSessionCacheManager.h → folly/wangle/ssl/SSLSessionCacheManager.h

@@ -9,8 +9,8 @@
  */
 #pragma once
 
-#include <folly/experimental/wangle/ssl/SSLCacheProvider.h>
-#include <folly/experimental/wangle/ssl/SSLStats.h>
+#include <folly/wangle/ssl/SSLCacheProvider.h>
+#include <folly/wangle/ssl/SSLStats.h>
 
 #include <folly/EvictingCacheMap.h>
 #include <mutex>

folly/experimental/wangle/ssl/SSLUtil.cpp → folly/wangle/ssl/SSLUtil.cpp

@@ -7,7 +7,7 @@
  *  of patent rights can be found in the PATENTS file in the same directory.
  *
  */
-#include <folly/experimental/wangle/ssl/SSLUtil.h>
+#include <folly/wangle/ssl/SSLUtil.h>
 
 #include <folly/Memory.h>
 

folly/experimental/wangle/ssl/TLSTicketKeyManager.cpp → folly/wangle/ssl/TLSTicketKeyManager.cpp

@@ -7,10 +7,10 @@
  *  of patent rights can be found in the PATENTS file in the same directory.
  *
  */
-#include <folly/experimental/wangle/ssl/TLSTicketKeyManager.h>
+#include <folly/wangle/ssl/TLSTicketKeyManager.h>
 
-#include <folly/experimental/wangle/ssl/SSLStats.h>
-#include <folly/experimental/wangle/ssl/SSLUtil.h>
+#include <folly/wangle/ssl/SSLStats.h>
+#include <folly/wangle/ssl/SSLUtil.h>
 
 #include <folly/String.h>
 #include <openssl/aes.h>

folly/experimental/wangle/ssl/test/SSLContextManagerTest.cpp → folly/wangle/ssl/test/SSLContextManagerTest.cpp

@@ -11,8 +11,8 @@
 #include <folly/io/async/SSLContext.h>
 #include <glog/logging.h>
 #include <gtest/gtest.h>
-#include <folly/experimental/wangle/ssl/SSLContextManager.h>
-#include <folly/experimental/wangle/acceptor/DomainNameMisc.h>
+#include <folly/wangle/ssl/SSLContextManager.h>
+#include <folly/wangle/acceptor/DomainNameMisc.h>
 
 using std::shared_ptr;