Fix include order and grouping in folly - 12/13

Summary: All changes were automated

Reviewed By: Orvid

Differential Revision: D25507587

fbshipit-source-id: fe757e6919793e9b8b28d6c1ce6f064d7e2623fb

folly/test/FunctionTest.cpp

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
+#include <folly/Function.h>
+
 #include <array>
 #include <cstdarg>
 
-#include <folly/Function.h>
-
 #include <folly/Memory.h>
 #include <folly/portability/GTest.h>
 

folly/test/FutexTest.cpp

@@ -15,7 +15,6 @@
  */
 
 #include <folly/detail/Futex.h>
-#include <folly/test/DeterministicSchedule.h>
 
 #include <chrono>
 #include <condition_variable>
@@ -28,6 +27,7 @@
 #include <folly/Chrono.h>
 #include <folly/portability/GTest.h>
 #include <folly/portability/Time.h>
+#include <folly/test/DeterministicSchedule.h>
 
 using namespace folly::detail;
 using namespace folly::test;

folly/test/GLogTest.cpp

@@ -16,10 +16,10 @@
 
 #include <folly/GLog.h>
 
-#include <folly/portability/GTest.h>
-
 #include <vector>
 
+#include <folly/portability/GTest.h>
+
 TEST(LogEveryMs, basic) {
   std::vector<std::chrono::steady_clock::time_point> hist;
 

folly/test/IPAddressBenchmark.cpp

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include <folly/Format.h>
 #include <folly/IPAddress.h>
 
 #include <glog/logging.h>
 
 #include <folly/Benchmark.h>
+#include <folly/Format.h>
 
 using namespace folly;
 using std::string;

folly/test/IPAddressTest.cpp

@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
+#include <folly/IPAddress.h>
+
 #include <sys/types.h>
 
 #include <string>
 
 #include <folly/Format.h>
-#include <folly/IPAddress.h>
 #include <folly/MacAddress.h>
 #include <folly/String.h>
 #include <folly/container/BitIterator.h>

folly/test/IndexedMemPoolTest.cpp

@@ -15,15 +15,16 @@
  */
 
 #include <folly/IndexedMemPool.h>
+
+#include <string>
+#include <thread>
+
 #include <folly/portability/GMock.h>
 #include <folly/portability/GTest.h>
 #include <folly/portability/Semaphore.h>
 #include <folly/portability/Unistd.h>
 #include <folly/test/DeterministicSchedule.h>
 
-#include <string>
-#include <thread>
-
 using namespace folly;
 using namespace folly::test;
 using namespace testing;

folly/test/IteratorsTest.cpp

@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
+#include <folly/detail/Iterators.h>
+
 #include <map>
 
 #include <folly/container/Array.h>
-#include <folly/detail/Iterators.h>
 #include <folly/portability/GTest.h>
 
 using namespace folly::detail;

folly/test/JsonOtherTest.cpp

@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-#include <folly/json.h>
-
 #include <folly/Benchmark.h>
 #include <folly/Conv.h>
 #include <folly/Range.h>
+#include <folly/json.h>
 #include <folly/portability/GFlags.h>
 #include <folly/portability/GTest.h>
 

folly/test/JsonTestUtilTest.cpp

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#include <folly/test/JsonTestUtil.h>
+
 #include <stdexcept>
 
 #include <glog/logging.h>
@@ -21,7 +23,6 @@
 #include <folly/portability/GMock.h>
 #include <folly/portability/GTest.h>
 #include <folly/test/JsonMockUtil.h>
-#include <folly/test/JsonTestUtil.h>
 
 using namespace folly;
 

folly/test/MPMCQueueTest.cpp

@@ -16,6 +16,15 @@
 
 #include <folly/MPMCQueue.h>
 
+#include <functional>
+#include <memory>
+#include <string>
+#include <thread>
+#include <utility>
+
+#include <boost/intrusive_ptr.hpp>
+#include <boost/thread/barrier.hpp>
+
 #include <folly/Format.h>
 #include <folly/Memory.h>
 #include <folly/portability/GTest.h>
@@ -25,13 +34,6 @@
 #include <folly/stop_watch.h>
 #include <folly/test/DeterministicSchedule.h>
 
-#include <boost/intrusive_ptr.hpp>
-#include <boost/thread/barrier.hpp>
-#include <functional>
-#include <memory>
-#include <thread>
-#include <utility>
-
 FOLLY_ASSUME_FBVECTOR_COMPATIBLE_1(boost::intrusive_ptr)
 
 using namespace folly;

folly/test/MathTest.cpp

@@ -15,7 +15,6 @@
  */
 
 #include <folly/Math.h>
-#include <folly/functional/Invoke.h>
 
 #include <algorithm>
 #include <array>
@@ -26,6 +25,7 @@
 #include <glog/logging.h>
 
 #include <folly/Portability.h>
+#include <folly/functional/Invoke.h>
 #include <folly/portability/GTest.h>
 
 using namespace folly;

folly/test/MemcpyTest.cpp

@@ -15,7 +15,6 @@
  */
 
 #include <folly/Portability.h>
-
 #include <folly/portability/GTest.h>
 
 namespace {

folly/test/MemoryIdlerTest.cpp

@@ -16,13 +16,13 @@
 
 #include <folly/detail/MemoryIdler.h>
 
+#include <memory>
+#include <thread>
+
 #include <folly/portability/GMock.h>
 #include <folly/portability/GTest.h>
 #include <folly/synchronization/Baton.h>
 
-#include <memory>
-#include <thread>
-
 using namespace folly;
 using namespace folly::detail;
 using namespace testing;

folly/test/OptionalTest.cpp

@@ -15,9 +15,6 @@
  */
 
 #include <folly/Optional.h>
-#include <folly/Portability.h>
-#include <folly/portability/GMock.h>
-#include <folly/portability/GTest.h>
 
 #include <algorithm>
 #include <initializer_list>
@@ -31,6 +28,10 @@
 
 #include <boost/optional.hpp>
 
+#include <folly/Portability.h>
+#include <folly/portability/GMock.h>
+#include <folly/portability/GTest.h>
+
 using std::shared_ptr;
 using std::unique_ptr;
 

folly/test/OverloadTest.cpp

@@ -19,6 +19,7 @@
 #include <variant>
 
 #include <boost/variant.hpp>
+
 #include <folly/DiscriminatedPtr.h>
 #include <folly/portability/GTest.h>
 

folly/test/PolyTest.cpp

@@ -16,14 +16,14 @@
 
 #include <folly/Poly.h>
 
+#include <array>
+
 #include <folly/Conv.h>
 #include <folly/CppAttributes.h>
 #include <folly/poly/Nullable.h>
 #include <folly/poly/Regular.h>
 #include <folly/portability/GTest.h>
 
-#include <array>
-
 using namespace folly;
 using namespace folly::poly;
 

folly/test/RangeFindBenchmark.cpp

@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-#include <folly/Range.h>
-
 #include <algorithm>
 #include <iostream>
 #include <random>
 #include <string>
 
 #include <folly/Benchmark.h>
+#include <folly/Range.h>
 #include <folly/container/Foreach.h>
 
 using namespace folly;

folly/test/ScopeGuardTest.cpp

@@ -16,13 +16,13 @@
 
 #include <folly/ScopeGuard.h>
 
-#include <glog/logging.h>
-
 #include <condition_variable>
 #include <functional>
 #include <stdexcept>
 #include <thread>
 
+#include <glog/logging.h>
+
 #include <folly/portability/GTest.h>
 
 using folly::makeGuard;

folly/test/SharedMutexTest.cpp

@@ -17,6 +17,7 @@
 #include <folly/SharedMutex.h>
 
 #include <stdlib.h>
+
 #include <random>
 #include <thread>
 #include <vector>

folly/test/SingletonTest.cpp

@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
+#include <folly/Singleton.h>
+
 #include <thread>
 
 #include <boost/thread/barrier.hpp>
 #include <glog/logging.h>
 
-#include <folly/Singleton.h>
 #include <folly/experimental/io/FsUtil.h>
 #include <folly/io/async/EventBase.h>
 #include <folly/portability/GMock.h>

folly/test/SocketAddressTestHelper.cpp

@@ -16,9 +16,10 @@
 
 #include <folly/test/SocketAddressTestHelper.h>
 
-#include <folly/portability/Sockets.h>
 #include <glog/logging.h>
 
+#include <folly/portability/Sockets.h>
+
 namespace folly {
 
 constexpr const char* SocketAddressTestHelper::kLoopbackAddrIPv4;

folly/test/SpinLockTest.cpp

@@ -16,10 +16,9 @@
 
 #include <folly/SpinLock.h>
 
-#include <folly/Random.h>
-
 #include <thread>
 
+#include <folly/Random.h>
 #include <folly/portability/Asm.h>
 #include <folly/portability/GMock.h>
 #include <folly/portability/GTest.h>

folly/test/StringBenchmark.cpp

@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-#include <fmt/format.h>
-#include <folly/Format.h>
-#include <folly/String.h>
-
 #include <boost/algorithm/string.hpp>
+
+#include <random>
+
+#include <fmt/format.h>
 #include <folly/Benchmark.h>
+#include <folly/Format.h>
 #include <folly/Random.h>
-#include <random>
+#include <folly/String.h>
 
 using namespace folly;
 using namespace std;

folly/test/StringTest.cpp

@@ -19,10 +19,10 @@
 #endif
 
 #include <folly/String.h>
-#include <tuple>
 
 #include <cinttypes>
 #include <set>
+#include <tuple>
 
 #include <boost/regex.hpp>
 #include <glog/logging.h>

folly/test/SubprocessTest.cpp

@@ -17,6 +17,7 @@
 #include <folly/Subprocess.h>
 
 #include <sys/types.h>
+
 #include <chrono>
 
 #include <boost/container/flat_set.hpp>

folly/test/SynchronizedBenchmark.cpp

@@ -16,9 +16,6 @@
 
 #include <folly/Synchronized.h>
 
-#include <folly/Benchmark.h>
-#include <folly/portability/GTest.h>
-
 #include <algorithm>
 #include <condition_variable>
 #include <map>
@@ -27,6 +24,9 @@
 #include <shared_mutex>
 #include <thread>
 
+#include <folly/Benchmark.h>
+#include <folly/portability/GTest.h>
+
 using namespace folly;
 using namespace folly::detail;
 

folly/test/SynchronizedTestLib-inl.h

@@ -16,11 +16,6 @@
 
 #pragma once
 
-#include <folly/Random.h>
-#include <folly/Synchronized.h>
-#include <folly/container/Foreach.h>
-#include <folly/portability/GTest.h>
-#include <glog/logging.h>
 #include <algorithm>
 #include <condition_variable>
 #include <functional>
@@ -29,6 +24,13 @@
 #include <thread>
 #include <vector>
 
+#include <glog/logging.h>
+
+#include <folly/Random.h>
+#include <folly/Synchronized.h>
+#include <folly/container/Foreach.h>
+#include <folly/portability/GTest.h>
+
 namespace folly {
 namespace sync_tests {
 

folly/test/ThreadLocalAccessBenchmark.cpp

@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-#include <folly/Benchmark.h>
-#include <folly/ThreadLocal.h>
 #include <condition_variable>
 #include <mutex>
 #include <thread>
 
+#include <folly/Benchmark.h>
+#include <folly/ThreadLocal.h>
+
 using namespace folly;
 
 namespace {

folly/test/ThreadLocalDestroyBenchmark.cpp

@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-#include <folly/Benchmark.h>
-#include <folly/ThreadLocal.h>
 #include <condition_variable>
 #include <mutex>
 #include <thread>
 
+#include <folly/Benchmark.h>
+#include <folly/ThreadLocal.h>
+
 using namespace folly;
 
 template <typename Tag1, typename Tag2>

folly/test/TypeListTest.cpp

@@ -15,6 +15,7 @@
  */
 
 #include <folly/detail/TypeList.h>
+
 #include <folly/portability/GTest.h>
 
 using namespace folly;

folly/test/UriTest.cpp

@@ -15,11 +15,13 @@
  */
 
 #include <folly/Uri.h>
-#include <folly/portability/GTest.h>
+
+#include <map>
 
 #include <boost/algorithm/string.hpp>
 #include <glog/logging.h>
-#include <map>
+
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 

folly/test/UtilityTest.cpp

@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include <folly/Utility.h>
+
 #include <type_traits>
 
-#include <folly/Utility.h>
 #include <folly/portability/GTest.h>
 
 namespace {

folly/test/common/TestMain.cpp

@@ -16,9 +16,8 @@
 
 #include <glog/logging.h>
 
-#include <folly/init/Init.h>
-
 #include <folly/Portability.h>
+#include <folly/init/Init.h>
 #include <folly/portability/GFlags.h>
 #include <folly/portability/GTest.h>
 

folly/test/function_benchmark/main.cpp

@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-#include <folly/test/function_benchmark/benchmark_impl.h>
-#include <folly/test/function_benchmark/test_functions.h>
-
 #include <glog/logging.h>
 
 #include <folly/Benchmark.h>
 #include <folly/ScopeGuard.h>
 #include <folly/portability/GFlags.h>
+#include <folly/test/function_benchmark/benchmark_impl.h>
+#include <folly/test/function_benchmark/test_functions.h>
 
 using folly::makeGuard;
 

folly/test/small_vector_test.cpp

@@ -15,7 +15,6 @@
  */
 
 #include <folly/small_vector.h>
-#include <folly/sorted_vector_types.h>
 
 #include <iostream>
 #include <iterator>
@@ -31,6 +30,7 @@
 #include <folly/Conv.h>
 #include <folly/Traits.h>
 #include <folly/portability/GTest.h>
+#include <folly/sorted_vector_types.h>
 
 using folly::small_vector;
 using namespace folly::small_vector_policy;

folly/test/sorted_vector_test.cpp

@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-#include <folly/small_vector.h>
-#include <folly/sorted_vector_types.h>
-
 #include <iterator>
 #include <list>
 #include <memory>
@@ -28,6 +25,8 @@
 #include <folly/memory/Malloc.h>
 #include <folly/portability/GMock.h>
 #include <folly/portability/GTest.h>
+#include <folly/small_vector.h>
+#include <folly/sorted_vector_types.h>
 
 using folly::sorted_vector_map;
 using folly::sorted_vector_set;

folly/tracing/AsyncStack.cpp

@@ -16,15 +16,15 @@
 
 #include <folly/tracing/AsyncStack.h>
 
-#include <folly/BenchmarkUtil.h>
-#include <folly/Likely.h>
-
-#include <glog/logging.h>
-
 #include <atomic>
 #include <cassert>
 #include <mutex>
 
+#include <glog/logging.h>
+
+#include <folly/BenchmarkUtil.h>
+#include <folly/Likely.h>
+
 #if defined(__linux__)
 #define FOLLY_ASYNC_STACK_ROOT_USE_PTHREAD 1
 #else

folly/tracing/AsyncStack.h

@@ -16,13 +16,13 @@
 
 #pragma once
 
+#include <atomic>
+#include <cassert>
+
 #include <folly/CPortability.h>
 #include <folly/CppAttributes.h>
 #include <folly/Portability.h>
 
-#include <atomic>
-#include <cassert>
-
 #if FOLLY_HAS_COROUTINES
 #include <experimental/coroutine>
 #endif

folly/tracing/test/AsyncStackTest.cpp

@@ -16,9 +16,10 @@
 
 #include <folly/tracing/AsyncStack.h>
 
-#include <folly/portability/GTest.h>
 #include <glog/logging.h>
 
+#include <folly/portability/GTest.h>
+
 TEST(AsyncStack, ScopedAsyncStackRoot) {
   void* const stackFramePtr = FOLLY_ASYNC_STACK_FRAME_POINTER();
   void* const returnAddress = FOLLY_ASYNC_STACK_RETURN_ADDRESS();