Commit 3c135dba authored by Alfred Fuller's avatar Alfred Fuller Committed by Facebook GitHub Bot

Fix include order and grouping in folly - 8/13

Summary: All changes were automated

Reviewed By: Orvid

Differential Revision: D25507562

fbshipit-source-id: ffed8f0e41d3581242b4e8e00bfd1fa6ee3e299b
parent a3de19be
......@@ -21,10 +21,9 @@
#include <functional>
#include <string>
#include <folly/synchronization/RWSpinLock.h>
#include <folly/io/async/AsyncServerSocket.h>
#include <folly/io/async/AsyncSocket.h>
#include <folly/synchronization/RWSpinLock.h>
namespace folly {
namespace test {
......
......@@ -15,6 +15,7 @@
*/
#include <folly/io/async/AsyncTimeout.h>
#include <folly/io/async/EventBase.h>
#include <folly/portability/GTest.h>
......
......@@ -14,6 +14,8 @@
* limitations under the License.
*/
#include <folly/io/async/AsyncUDPSocket.h>
#include <thread>
#include <folly/Conv.h>
......@@ -23,7 +25,6 @@
#include <folly/io/IOBuf.h>
#include <folly/io/async/AsyncTimeout.h>
#include <folly/io/async/AsyncUDPServerSocket.h>
#include <folly/io/async/AsyncUDPSocket.h>
#include <folly/io/async/EventBase.h>
#include <folly/portability/GMock.h>
#include <folly/portability/GTest.h>
......
......@@ -14,14 +14,14 @@
* limitations under the License.
*/
#include <folly/io/async/EventBase.h>
#include <folly/io/async/EventBaseAtomicNotificationQueue.h>
#include <folly/portability/GTest.h>
#include <functional>
#include <utility>
#include <vector>
#include <folly/io/async/EventBase.h>
#include <folly/io/async/EventBaseAtomicNotificationQueue.h>
#include <folly/portability/GTest.h>
using namespace folly;
using namespace std;
......
......@@ -16,9 +16,10 @@
#include <folly/io/async/DelayedDestruction.h>
#include <folly/portability/GTest.h>
#include <glog/logging.h>
#include <folly/portability/GTest.h>
using namespace folly;
class DeleteGuarder : public DelayedDestruction {
......
......@@ -15,6 +15,7 @@
*/
#include <folly/io/async/DestructorCheck.h>
#include <folly/Memory.h>
#include <folly/portability/GTest.h>
......
......@@ -15,6 +15,7 @@
*/
#include <folly/io/async/EventBaseLocal.h>
#include <folly/portability/GTest.h>
struct Foo {
......
......@@ -14,9 +14,15 @@
* limitations under the License.
*/
#include <atomic>
#include <future>
#include <iostream>
#include <memory>
#include <thread>
#include <folly/Memory.h>
#include <folly/ScopeGuard.h>
#include <folly/futures/Promise.h>
#include <folly/io/async/AsyncTimeout.h>
#include <folly/io/async/EventBase.h>
#include <folly/io/async/EventHandler.h>
......@@ -24,16 +30,8 @@
#include <folly/io/async/test/Util.h>
#include <folly/portability/Stdlib.h>
#include <folly/portability/Unistd.h>
#include <folly/system/ThreadName.h>
#include <folly/futures/Promise.h>
#include <folly/synchronization/Baton.h>
#include <atomic>
#include <future>
#include <iostream>
#include <memory>
#include <thread>
#include <folly/system/ThreadName.h>
#define FOLLY_SKIP_IF_NULLPTR_BACKEND_WITH_OPTS(evb, opts) \
std::unique_ptr<EventBase> evb##Ptr; \
......
......@@ -14,6 +14,10 @@
* limitations under the License.
*/
#include <folly/io/async/EventHandler.h>
#include <sys/eventfd.h>
#include <bitset>
#include <future>
#include <thread>
......@@ -21,11 +25,9 @@
#include <folly/MPMCQueue.h>
#include <folly/ScopeGuard.h>
#include <folly/io/async/EventBase.h>
#include <folly/io/async/EventHandler.h>
#include <folly/portability/GMock.h>
#include <folly/portability/GTest.h>
#include <folly/portability/Sockets.h>
#include <sys/eventfd.h>
using namespace std;
using namespace folly;
......
......@@ -14,6 +14,9 @@
* limitations under the License.
*/
#include <thread>
#include <vector>
#include <folly/Random.h>
#include <folly/io/async/EventBase.h>
#include <folly/io/async/HHWheelTimer.h>
......@@ -21,9 +24,6 @@
#include <folly/io/async/test/Util.h>
#include <folly/portability/GTest.h>
#include <thread>
#include <vector>
using namespace folly;
using std::chrono::milliseconds;
......
......@@ -15,6 +15,7 @@
*/
#include <folly/io/async/HHWheelTimer.h>
#include <folly/io/async/EventBase.h>
#include <folly/io/async/test/UndelayedDestruction.h>
#include <folly/io/async/test/Util.h>
......
......@@ -16,11 +16,11 @@
#pragma once
#include <chrono>
#include <folly/io/async/TimeoutManager.h>
#include <folly/portability/GMock.h>
#include <chrono>
namespace folly {
namespace test {
......
......@@ -14,11 +14,6 @@
* limitations under the License.
*/
#include <folly/container/Array.h>
#include <folly/io/async/test/RequestContextHelper.h>
#include <folly/portability/GFlags.h>
#include <folly/synchronization/test/Barrier.h>
#include <chrono>
#include <cmath>
#include <iomanip>
......@@ -26,6 +21,11 @@
#include <thread>
#include <vector>
#include <folly/container/Array.h>
#include <folly/io/async/test/RequestContextHelper.h>
#include <folly/portability/GFlags.h>
#include <folly/synchronization/test/Barrier.h>
DEFINE_int32(reps, 10, "number of reps");
DEFINE_int32(ops, 1000000, "number of operations per rep");
......
......@@ -14,11 +14,11 @@
* limitations under the License.
*/
#include <folly/io/async/test/AsyncSSLSocketTest.h>
#include <functional>
#include <folly/init/Init.h>
#include <folly/io/async/SSLContext.h>
#include <folly/io/async/test/AsyncSSLSocketTest.h>
#include <folly/portability/GTest.h>
#include <folly/ssl/Init.h>
......
......@@ -15,12 +15,12 @@
*/
#include <folly/io/async/SSLContext.h>
#include <folly/FileUtil.h>
#include <folly/io/async/test/SSLUtil.h>
#include <folly/portability/GTest.h>
#include <folly/ssl/OpenSSLPtrTypes.h>
#include <folly/io/async/test/SSLUtil.h>
using namespace std;
namespace folly {
......
......@@ -15,12 +15,12 @@
*/
#include <folly/io/async/SSLOptions.h>
#include <folly/io/async/SSLContext.h>
#include <folly/io/async/test/SSLUtil.h>
#include <folly/portability/GTest.h>
#include <folly/ssl/OpenSSLPtrTypes.h>
#include <folly/io/async/test/SSLUtil.h>
using namespace std;
namespace folly {
......
......@@ -15,6 +15,9 @@
*/
#include <folly/ssl/SSLSession.h>
#include <memory>
#include <folly/io/async/test/AsyncSSLSocketTest.h>
#include <folly/net/NetOps.h>
#include <folly/net/NetworkSocket.h>
......@@ -23,8 +26,6 @@
#include <folly/portability/Sockets.h>
#include <folly/ssl/detail/OpenSSLSession.h>
#include <memory>
using folly::ssl::SSLSession;
using folly::ssl::detail::OpenSSLSession;
......
......@@ -14,11 +14,11 @@
* limitations under the License.
*/
#include <folly/io/async/test/SSLUtil.h>
#include <algorithm>
#include <set>
#include <folly/io/async/test/SSLUtil.h>
namespace {
std::set<std::string> const suitesFor13{
......
......@@ -14,11 +14,10 @@
* limitations under the License.
*/
#include <folly/io/async/test/BlockingSocket.h>
#include <iostream>
#include <folly/ExceptionWrapper.h>
#include <folly/io/async/test/BlockingSocket.h>
#include <folly/portability/GFlags.h>
using namespace folly;
......
......@@ -16,15 +16,15 @@
#include <folly/io/async/test/SocketPair.h>
#include <cerrno>
#include <stdexcept>
#include <folly/Conv.h>
#include <folly/net/NetOps.h>
#include <folly/portability/Fcntl.h>
#include <folly/portability/Sockets.h>
#include <folly/portability/Unistd.h>
#include <cerrno>
#include <stdexcept>
namespace folly {
SocketPair::SocketPair(Mode mode) {
......
......@@ -15,6 +15,7 @@
*/
#include <folly/io/async/test/TestSSLServer.h>
#include <folly/portability/OpenSSL.h>
namespace folly {
......
......@@ -16,6 +16,11 @@
#pragma once
#include <fcntl.h>
#include <sys/types.h>
#include <list>
#include <folly/SocketAddress.h>
#include <folly/experimental/TestUtil.h>
#include <folly/io/async/AsyncSSLSocket.h>
......@@ -29,10 +34,6 @@
#include <folly/portability/Sockets.h>
#include <folly/portability/Unistd.h>
#include <fcntl.h>
#include <sys/types.h>
#include <list>
namespace folly {
extern const char* kTestCert;
......
......@@ -23,6 +23,7 @@
#include <fcntl.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <cerrno>
#ifdef __linux__
#include <sys/utsname.h>
......@@ -32,6 +33,8 @@
#include <ostream>
#include <stdexcept>
#include <glog/logging.h>
#include <folly/Conv.h>
#include <folly/Portability.h>
#include <folly/ScopeGuard.h>
......@@ -39,8 +42,6 @@
#include <folly/portability/Unistd.h>
#include <folly/system/ThreadId.h>
#include <glog/logging.h>
using std::string;
using namespace std::chrono;
......
......@@ -14,11 +14,12 @@
* limitations under the License.
*/
#include <folly/io/async/test/TimeUtil.h>
#include <thread>
#include <glog/logging.h>
#include <folly/io/async/test/TimeUtil.h>
#include <folly/portability/GTest.h>
#include <folly/portability/Unistd.h>
......
......@@ -15,6 +15,7 @@
*/
#include <folly/io/async/WriteChainAsyncTransportWrapper.h>
#include <folly/io/async/AsyncTransport.h>
#include <folly/portability/GMock.h>
#include <folly/portability/GTest.h>
......
......@@ -15,6 +15,7 @@
*/
#include <folly/io/async/test/ZeroCopy.h>
#include <folly/portability/GTest.h>
using namespace folly;
......
......@@ -14,12 +14,11 @@
* limitations under the License.
*/
#include <folly/io/IOBuf.h>
#include <folly/Benchmark.h>
#include <folly/Format.h>
#include <folly/Range.h>
#include <folly/io/Cursor.h>
#include <folly/io/IOBuf.h>
DECLARE_bool(benchmark);
......
......@@ -14,14 +14,14 @@
* limitations under the License.
*/
#include <folly/io/IOBuf.h>
#include <numeric>
#include <vector>
#include <folly/Format.h>
#include <folly/Range.h>
#include <folly/io/Cursor.h>
#include <folly/io/IOBuf.h>
#include <folly/portability/GTest.h>
#include <numeric>
#include <vector>
using folly::ByteRange;
using folly::format;
......
......@@ -15,12 +15,12 @@
*/
#include <folly/io/IOBuf.h>
#include <folly/io/TypedIOBuf.h>
#include <cstddef>
#include <random>
#include <folly/Range.h>
#include <folly/io/TypedIOBuf.h>
#include <folly/memory/Malloc.h>
#include <folly/portability/GTest.h>
......
......@@ -16,15 +16,15 @@
// @author Tudor Bosman (tudorb@fb.com)
#include <folly/lang/Bits.h>
#include <algorithm>
#include <vector>
#include <folly/Benchmark.h>
#include <folly/CppAttributes.h>
#include <folly/Random.h>
#include <folly/lang/Assume.h>
#include <folly/lang/Bits.h>
#include <folly/Benchmark.h>
BENCHMARK(nextPowTwoClz, iters) {
for (unsigned long i = 0; i < iters; ++i) {
......
......@@ -16,13 +16,13 @@
// @author Tudor Bosman (tudorb@fb.com)
#include <folly/lang/Bits.h>
#include <algorithm>
#include <random>
#include <vector>
#include <folly/Random.h>
#include <folly/lang/Bits.h>
#include <folly/portability/GTest.h>
namespace folly {
......
......@@ -15,6 +15,7 @@
*/
#include <folly/lang/Launder.h>
#include <folly/portability/GTest.h>
using namespace folly;
......
......@@ -14,9 +14,10 @@
* limitations under the License.
*/
#include <folly/lang/RValueReferenceWrapper.h>
#include <utility>
#include <folly/lang/RValueReferenceWrapper.h>
#include <folly/portability/GTest.h>
TEST(RvalueReferenceWrapper, MoveAndConvert) {
......
......@@ -15,9 +15,11 @@
*/
#include <folly/lang/UncaughtExceptions.h>
#include <glog/logging.h>
#include <folly/Conv.h>
#include <folly/portability/GTest.h>
#include <glog/logging.h>
/*
* Test helper class, when goes out of scope it validaes that
......
......@@ -16,10 +16,10 @@
#pragma once
#include <folly/logging/AsyncLogWriter.h>
#include <vector>
#include <folly/logging/AsyncLogWriter.h>
namespace folly {
/**
* An implementation of `folly::AsyncLogWriter` that writes log messages into a
......
......@@ -16,11 +16,12 @@
#include <folly/logging/CustomLogFormatter.h>
#include <algorithm>
#include <folly/Format.h>
#include <folly/logging/LogLevel.h>
#include <folly/logging/LogMessage.h>
#include <folly/portability/Time.h>
#include <algorithm>
namespace {
using folly::LogLevel;
......
......@@ -16,9 +16,10 @@
#pragma once
#include <string>
#include <folly/Range.h>
#include <folly/logging/LogFormatter.h>
#include <string>
namespace folly {
......
......@@ -16,9 +16,10 @@
#pragma once
#include <memory>
#include <folly/Optional.h>
#include <folly/Range.h>
#include <memory>
namespace folly {
......
......@@ -17,6 +17,7 @@
#pragma once
#include <sys/types.h>
#include <chrono>
#include <string>
......
......@@ -16,6 +16,8 @@
#pragma once
#include <cstdlib>
#include <fmt/core.h>
#include <folly/CPortability.h>
#include <folly/Conv.h>
......@@ -26,7 +28,6 @@
#include <folly/logging/LogMessage.h>
#include <folly/logging/LogStream.h>
#include <folly/logging/ObjectToString.h>
#include <cstdlib>
namespace folly {
......
......@@ -16,12 +16,12 @@
#include <folly/logging/StandardLogHandler.h>
#include <utility>
#include <folly/logging/LogFormatter.h>
#include <folly/logging/LogMessage.h>
#include <folly/logging/LogWriter.h>
#include <utility>
namespace folly {
StandardLogHandler::StandardLogHandler(
......
......@@ -16,9 +16,8 @@
#include <folly/init/Init.h>
#include <folly/logging/Init.h>
#include <folly/logging/xlog.h>
#include <folly/logging/example/lib.h>
#include <folly/logging/xlog.h>
using namespace example;
......
......@@ -14,6 +14,8 @@
* limitations under the License.
*/
#include <folly/logging/AsyncFileWriter.h>
#include <thread>
#include <folly/Conv.h>
......@@ -27,7 +29,6 @@
#include <folly/futures/Promise.h>
#include <folly/init/Init.h>
#include <folly/lang/SafeAssert.h>
#include <folly/logging/AsyncFileWriter.h>
#include <folly/logging/Init.h>
#include <folly/logging/LoggerDB.h>
#include <folly/logging/xlog.h>
......
......@@ -16,11 +16,12 @@
#include <folly/logging/AsyncLogWriter.h>
#include <iostream>
#include <folly/logging/LoggerDB.h>
#include <folly/portability/GMock.h>
#include <folly/portability/GTest.h>
#include <folly/test/TestUtils.h>
#include <iostream>
using namespace folly;
......
......@@ -14,14 +14,14 @@
* limitations under the License.
*/
#include <folly/logging/xlog.h>
#include <folly/logging/BridgeFromGoogleLogging.h>
#include <folly/logging/LogConfigParser.h>
#include <folly/logging/LogHandler.h>
#include <folly/logging/LogMessage.h>
#include <folly/logging/LoggerDB.h>
#include <folly/logging/test/TestLogHandler.h>
#include <folly/logging/xlog.h>
#include <folly/portability/GTest.h>
#include <folly/test/TestUtils.h>
......
......@@ -14,11 +14,12 @@
* limitations under the License.
*/
#include <folly/logging/CustomLogFormatter.h>
#include <cstdlib>
#include <folly/Format.h>
#include <folly/init/Init.h>
#include <folly/logging/CustomLogFormatter.h>
#include <folly/logging/LogMessage.h>
#include <folly/logging/Logger.h>
#include <folly/logging/LoggerDB.h>
......
......@@ -15,7 +15,6 @@
*/
#include <folly/logging/FileHandlerFactory.h>
#include <folly/logging/StreamHandlerFactory.h>
#include <folly/Exception.h>
#include <folly/experimental/TestUtil.h>
......@@ -23,6 +22,7 @@
#include <folly/logging/GlogStyleFormatter.h>
#include <folly/logging/ImmediateFileWriter.h>
#include <folly/logging/StandardLogHandler.h>
#include <folly/logging/StreamHandlerFactory.h>
#include <folly/portability/GTest.h>
#include <folly/test/TestUtils.h>
......
......@@ -15,6 +15,7 @@
*/
#include <folly/logging/LogLevel.h>
#include <folly/Conv.h>
#include <folly/Random.h>
#include <folly/portability/GTest.h>
......
......@@ -15,6 +15,7 @@
*/
#include <folly/logging/LogName.h>
#include <folly/portability/GTest.h>
using namespace folly;
......
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