Sort #include lines

Summary: [Folly] Sort `#include` lines, as required by `clang-format`.

Reviewed By: igorsugak, Orvid

Differential Revision: D5405153

fbshipit-source-id: 3bb1c2b84271bcf7a195e07680777dbfdd499823

diff --git a/folly/Arena.h b/folly/Arena.h
index f70988f0da0089be907cac108a55f2f4717c7701..cf010f3d4375d9f9c3700f010d8111f5f06ed300 100644 (file)
--- a/folly/Arena.h
+++ b/folly/Arena.h
@@ -21,6 +21,7 @@
 #include <limits>
 #include <stdexcept>
 #include <utility>
+
 #include <boost/intrusive/slist.hpp>
 
 #include <folly/Conv.h>

diff --git a/folly/AtomicHashMap.h b/folly/AtomicHashMap.h
index 70d71491a4499231f3de70377da3bf31088645a1..962e9de96f8d4a167d75022071fe264cf9e373fb 100644 (file)
--- a/folly/AtomicHashMap.h
+++ b/folly/AtomicHashMap.h
@@ -86,9 +86,9 @@
 #include <boost/noncopyable.hpp>
 #include <boost/type_traits/is_convertible.hpp>
 
-#include <stdexcept>
-#include <functional>
 #include <atomic>
+#include <functional>
+#include <stdexcept>
 
 #include <folly/AtomicHashArray.h>
 #include <folly/Foreach.h>

diff --git a/folly/AtomicUnorderedMap.h b/folly/AtomicUnorderedMap.h
index 45877e1ce475a59b5392cc92b4e40aeaf6194f26..3a13aa9f28f3bb5b8832348e93af70f6ac150875 100644 (file)
--- a/folly/AtomicUnorderedMap.h
+++ b/folly/AtomicUnorderedMap.h
@@ -17,11 +17,14 @@
 #pragma once
 
 #include <atomic>
+#include <cstdint>
 #include <functional>
+#include <limits>
 #include <stdexcept>
 #include <system_error>
 #include <type_traits>
-#include <stdint.h>
+
+#include <boost/type_traits/has_trivial_destructor.hpp>
 
 #include <folly/Bits.h>
 #include <folly/Conv.h>
@@ -31,9 +34,6 @@
 #include <folly/portability/SysMman.h>
 #include <folly/portability/Unistd.h>
 
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <limits>
-
 namespace folly {
 
 /// You're probably reading this because you are looking for an

diff --git a/folly/Benchmark.cpp b/folly/Benchmark.cpp
index ecb7a8af3e0ae44a12fa867d0a7b8f1d34929a92..8130646d05c0563386bbe1949e907693293aed3f 100644 (file)
--- a/folly/Benchmark.cpp
+++ b/folly/Benchmark.cpp
@@ -17,18 +17,20 @@
 // @author Andrei Alexandrescu (andrei.alexandrescu@fb.com)
 
 #include <folly/Benchmark.h>
-#include <folly/Foreach.h>
-#include <folly/json.h>
-#include <folly/String.h>
 
 #include <algorithm>
-#include <boost/regex.hpp>
 #include <cmath>
+#include <cstring>
 #include <iostream>
 #include <limits>
 #include <utility>
 #include <vector>
-#include <cstring>
+
+#include <boost/regex.hpp>
+
+#include <folly/Foreach.h>
+#include <folly/String.h>
+#include <folly/json.h>
 
 using namespace std;
 

diff --git a/folly/Bits.h b/folly/Bits.h
index ade5bbeeb7b39572f47e73e6405a54184d72984b..940b7bf05c4dd996455cb7c556810b730c05953c 100644 (file)
--- a/folly/Bits.h
+++ b/folly/Bits.h
@@ -62,21 +62,21 @@
 #define FOLLY_INTRINSIC_CONSTEXPR const
 #endif
 
-#include <folly/Portability.h>
-#include <folly/portability/Builtins.h>
-
-#include <folly/Assume.h>
-#include <folly/detail/BitIteratorDetail.h>
-#include <folly/Likely.h>
-
 #include <cassert>
-#include <cstring>
 #include <cinttypes>
+#include <cstdint>
+#include <cstring>
 #include <iterator>
 #include <limits>
 #include <type_traits>
+
 #include <boost/iterator/iterator_adaptor.hpp>
-#include <stdint.h>
+
+#include <folly/Assume.h>
+#include <folly/Likely.h>
+#include <folly/Portability.h>
+#include <folly/detail/BitIteratorDetail.h>
+#include <folly/portability/Builtins.h>
 
 namespace folly {
 

diff --git a/folly/ConcurrentSkipList-inl.h b/folly/ConcurrentSkipList-inl.h
index 122f21c64789e381b288be87378b44e0b6988363..61279a9652ac1e31b3a023d85c9910903bbc7b9e 100644 (file)
--- a/folly/ConcurrentSkipList-inl.h
+++ b/folly/ConcurrentSkipList-inl.h
@@ -26,6 +26,7 @@
 #include <mutex>
 #include <type_traits>
 #include <vector>
+
 #include <boost/noncopyable.hpp>
 #include <boost/random.hpp>
 #include <boost/type_traits.hpp>

diff --git a/folly/ConcurrentSkipList.h b/folly/ConcurrentSkipList.h
index 8b06f3317db976f165676d407dd755a912b00d95..a1a694a6e3f297344a73ce33dcb7aff5ac9327bb 100644 (file)
--- a/folly/ConcurrentSkipList.h
+++ b/folly/ConcurrentSkipList.h
@@ -124,6 +124,7 @@ Sample usage:
 #include <limits>
 #include <memory>
 #include <type_traits>
+
 #include <boost/iterator/iterator_facade.hpp>
 #include <glog/logging.h>
 

diff --git a/folly/CpuId.h b/folly/CpuId.h
index bbd36c219a40099210a8daacbc166ad9354335b8..bcbea19714320248094c52b60d585fc608dfea79 100644 (file)
--- a/folly/CpuId.h
+++ b/folly/CpuId.h
@@ -17,6 +17,7 @@
 #pragma once
 
 #include <cstdint>
+
 #include <folly/Portability.h>
 
 #ifdef _MSC_VER

diff --git a/folly/Demangle.cpp b/folly/Demangle.cpp
index 7145096c5b25952a9d2cbc77bc6eeeafb1b50b65..14eb1ad7dbac62fe6726c3e3c9fec650a85a2f40 100644 (file)
--- a/folly/Demangle.cpp
+++ b/folly/Demangle.cpp
@@ -17,13 +17,13 @@
 #include <folly/Demangle.h>
 
 #include <algorithm>
-#include <string.h>
+#include <cstring>
 
 #include <folly/Malloc.h>
 #include <folly/portability/Config.h>
 
 #if FOLLY_HAVE_CPLUS_DEMANGLE_V3_CALLBACK
-# include <cxxabi.h>
+#include <cxxabi.h>
 
 // From libiberty
 //

diff --git a/folly/DiscriminatedPtr.h b/folly/DiscriminatedPtr.h
index 0d485f50580686477811a5c9dedb7ba03b3b0ec9..0195beac7f846646e5d40856e5e85f04f17c0810 100644 (file)
--- a/folly/DiscriminatedPtr.h
+++ b/folly/DiscriminatedPtr.h
@@ -28,7 +28,9 @@
 
 #include <limits>
 #include <stdexcept>
+
 #include <glog/logging.h>
+
 #include <folly/Likely.h>
 #include <folly/Portability.h>
 #include <folly/detail/DiscriminatedPtrDetail.h>

diff --git a/folly/DynamicConverter.h b/folly/DynamicConverter.h
index 5da62711a498f796fa7929be00e11944f55344cb..e73c19c21fa53aeba17de2add3374f147b80a820 100644 (file)
--- a/folly/DynamicConverter.h
+++ b/folly/DynamicConverter.h
@@ -18,8 +18,15 @@
 
 #pragma once
 
-#include <folly/dynamic.h>
+#include <iterator>
+#include <type_traits>
+
+#include <boost/iterator/iterator_adaptor.hpp>
+#include <boost/mpl/has_xxx.hpp>
+
+#include <folly/Likely.h>
 #include <folly/Traits.h>
+#include <folly/dynamic.h>
 
 namespace folly {
   template <typename T> T convertTo(const dynamic&);
@@ -39,13 +46,6 @@ namespace folly {
  * See docs/DynamicConverter.md for supported types and customization
  */
 
-
-#include <type_traits>
-#include <iterator>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/mpl/has_xxx.hpp>
-#include <folly/Likely.h>
-
 namespace folly {
 
 ///////////////////////////////////////////////////////////////////////////////

diff --git a/folly/EvictingCacheMap.h b/folly/EvictingCacheMap.h
index 77517f5ac5502677007a03c6a559fba8fb7bad3b..d94fac022e88eafd8e27972d5143a99815fee028 100644 (file)
--- a/folly/EvictingCacheMap.h
+++ b/folly/EvictingCacheMap.h
@@ -20,10 +20,11 @@
 #include <exception>
 #include <functional>
 
-#include <boost/utility.hpp>
 #include <boost/intrusive/list.hpp>
 #include <boost/intrusive/unordered_set.hpp>
 #include <boost/iterator/iterator_adaptor.hpp>
+#include <boost/utility.hpp>
+
 #include <folly/portability/BitsFunctexcept.h>
 
 namespace folly {

diff --git a/folly/FileUtil.h b/folly/FileUtil.h
index d3260f917293013e3eeb9a518b58e8f0a4a12769..c27e249af4e2727d5a1c20b093ed1aee09c8393d 100644 (file)
--- a/folly/FileUtil.h
+++ b/folly/FileUtil.h
@@ -16,6 +16,12 @@
 
 #pragma once
 
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include <cassert>
+#include <limits>
+
 #include <folly/Portability.h>
 #include <folly/Range.h>
 #include <folly/ScopeGuard.h>
@@ -23,11 +29,6 @@
 #include <folly/portability/SysUio.h>
 #include <folly/portability/Unistd.h>
 
-#include <cassert>
-#include <limits>
-#include <sys/stat.h>
-#include <sys/types.h>
-
 namespace folly {
 
 /**

diff --git a/folly/FormatArg.h b/folly/FormatArg.h
index 48311e3d4e7cd18a77aeacb553dd0d4c98fc7ee9..fec6e811773abe422486cdf2dd11c6f234c462c5 100644 (file)
--- a/folly/FormatArg.h
+++ b/folly/FormatArg.h
@@ -17,6 +17,7 @@
 #pragma once
 
 #include <stdexcept>
+
 #include <folly/Conv.h>
 #include <folly/Likely.h>
 #include <folly/Portability.h>

diff --git a/folly/GroupVarint.h b/folly/GroupVarint.h
index 9652a4d1ad185967dac209184305841e56b18005..8a101d51ec5b889038e939bf1f9218b88482522f 100644 (file)
--- a/folly/GroupVarint.h
+++ b/folly/GroupVarint.h
@@ -16,6 +16,11 @@
 
 #pragma once
 
+#include <cstdint>
+#include <limits>
+
+#include <glog/logging.h>
+
 #if !defined(__GNUC__) && !defined(_MSC_VER)
 #error GroupVarint.h requires GCC or MSVC
 #endif
@@ -25,13 +30,10 @@
 #if FOLLY_X64 || defined(__i386__) || FOLLY_PPC64 || FOLLY_A64
 #define HAVE_GROUP_VARINT 1
 
-#include <cstdint>
-#include <limits>
-#include <folly/detail/GroupVarintDetail.h>
 #include <folly/Bits.h>
 #include <folly/Range.h>
+#include <folly/detail/GroupVarintDetail.h>
 #include <folly/portability/Builtins.h>
-#include <glog/logging.h>
 
 #if FOLLY_SSE >= 3
 #include <nmmintrin.h>

diff --git a/folly/IPAddress.h b/folly/IPAddress.h
index bd6906cf174031feb3c27be848a478595cfedfbc..4ed42a983f48c1335ebd4cc8bff45b93acad1659 100644 (file)
--- a/folly/IPAddress.h
+++ b/folly/IPAddress.h
@@ -22,10 +22,10 @@
 #include <string>
 #include <utility> // std::pair
 
-#include <folly/Range.h>
 #include <folly/IPAddressException.h>
 #include <folly/IPAddressV4.h>
 #include <folly/IPAddressV6.h>
+#include <folly/Range.h>
 #include <folly/detail/IPAddress.h>
 
 namespace folly {

diff --git a/folly/Lazy.h b/folly/Lazy.h
index 786f51c6ac0e9b3807b77b6430f25aeb8509dd6e..32723bc1053694188580736f05fe6f74b97b428f 100644 (file)
--- a/folly/Lazy.h
+++ b/folly/Lazy.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <utility>
 #include <type_traits>
+#include <utility>
 
 #include <folly/Optional.h>
 

diff --git a/folly/LifoSem.h b/folly/LifoSem.h
index 9c0404fe1c6c90136c037a1090a9476c309bc4ab..aeefdaa1a494806824015764ee46f362c7e71434 100644 (file)
--- a/folly/LifoSem.h
+++ b/folly/LifoSem.h
@@ -16,10 +16,10 @@
 
 #pragma once
 
-#include <string.h>
-#include <stdint.h>
-#include <atomic>
 #include <algorithm>
+#include <atomic>
+#include <cstdint>
+#include <cstring>
 #include <memory>
 #include <system_error>
 

diff --git a/folly/Logging.h b/folly/Logging.h
index 70172706ed7f2bd5a9c60967e513e7111e16fd11..106aec3a94feff38eb7a3b439138a1a7cb112d23 100644 (file)
--- a/folly/Logging.h
+++ b/folly/Logging.h
@@ -18,6 +18,7 @@
 
 #include <atomic>
 #include <chrono>
+
 #include <glog/logging.h>
 
 #ifndef FB_LOG_EVERY_MS

diff --git a/folly/MPMCQueue.h b/folly/MPMCQueue.h
index 0e92106072a28e6344f90d4228a9edf6c87dc5b9..6ae222da10fd56fa229c79ba0302897f69fa1315 100644 (file)
--- a/folly/MPMCQueue.h
+++ b/folly/MPMCQueue.h
@@ -18,12 +18,13 @@
 
 #include <algorithm>
 #include <atomic>
-#include <assert.h>
-#include <boost/noncopyable.hpp>
+#include <cassert>
+#include <cstring>
 #include <limits>
-#include <string.h>
 #include <type_traits>
 
+#include <boost/noncopyable.hpp>
+
 #include <folly/Traits.h>
 #include <folly/concurrency/CacheLocality.h>
 #include <folly/detail/TurnSequencer.h>

diff --git a/folly/MemoryMapping.h b/folly/MemoryMapping.h
index 14ce382da7938c510f09073afdfb12a6c255eae2..c05bad755de080795d4da25084e58df3e3898d5d 100644 (file)
--- a/folly/MemoryMapping.h
+++ b/folly/MemoryMapping.h
@@ -16,10 +16,11 @@
 
 #pragma once
 
+#include <boost/noncopyable.hpp>
+#include <glog/logging.h>
+
 #include <folly/File.h>
 #include <folly/Range.h>
-#include <glog/logging.h>
-#include <boost/noncopyable.hpp>
 
 namespace folly {
 

diff --git a/folly/MicroLock.h b/folly/MicroLock.h
index 511d06fa605860755b8f1052a4ebf391e0528346..c358814da7c008eba708c82c2c32fb82c0bf46f5 100644 (file)
--- a/folly/MicroLock.h
+++ b/folly/MicroLock.h
@@ -16,11 +16,12 @@
 
 #pragma once
 
-#include <assert.h>
+#include <cassert>
 #include <climits>
-#include <stdint.h>
-#include <folly/detail/Futex.h>
+#include <cstdint>
+
 #include <folly/Portability.h>
+#include <folly/detail/Futex.h>
 
 #if defined(__clang__)
 #define NO_SANITIZE_ADDRESS __attribute__((no_sanitize_address))

diff --git a/folly/MicroSpinLock.h b/folly/MicroSpinLock.h
index 0453b35599ec3e526633171f386b6285d87679c8..737ac70efaf63010b1ff74975941778649a07a4b 100644 (file)
--- a/folly/MicroSpinLock.h
+++ b/folly/MicroSpinLock.h
@@ -38,16 +38,17 @@
  */
 
 #include <array>
+#include <atomic>
 #include <cinttypes>
-#include <type_traits>
-#include <boost/noncopyable.hpp>
 #include <cstdlib>
 #include <mutex>
-#include <atomic>
+#include <type_traits>
 
+#include <boost/noncopyable.hpp>
 #include <glog/logging.h>
-#include <folly/detail/Sleeper.h>
+
 #include <folly/Portability.h>
+#include <folly/detail/Sleeper.h>
 
 namespace folly {
 

diff --git a/folly/PackedSyncPtr.h b/folly/PackedSyncPtr.h
index e11588e8419540a32f5ff80e38749253c1f134b1..692fbf9bac43dd4a9121452e6d9e8e0ebf4c3a93 100644 (file)
--- a/folly/PackedSyncPtr.h
+++ b/folly/PackedSyncPtr.h
@@ -16,10 +16,15 @@
 
 #pragma once
 
+#include <type_traits>
+
+#include <glog/logging.h>
+
 #include <folly/Portability.h>
+#include <folly/SmallLocks.h>
 
 #if !FOLLY_X64 && !FOLLY_PPC64 && !FOLLY_A64
-# error "PackedSyncPtr is x64, ppc64 or aarch64 specific code."
+#error "PackedSyncPtr is x64, ppc64 or aarch64 specific code."
 #endif
 
 /*
@@ -52,10 +57,6 @@
  * @author Jordan DeLong <delong.j@fb.com>
  */
 
-#include <folly/SmallLocks.h>
-#include <type_traits>
-#include <glog/logging.h>
-
 namespace folly {
 
 template<class T>

diff --git a/folly/Padded.h b/folly/Padded.h
index 93b37ab4e4abfee37e47d73259150a220053db58..ca499aad0f70ad0626f620c06aca676caa400ce9 100644 (file)
--- a/folly/Padded.h
+++ b/folly/Padded.h
@@ -27,8 +27,8 @@
 
 #include <boost/iterator/iterator_adaptor.hpp>
 
-#include <folly/Portability.h>
 #include <folly/ContainerTraits.h>
+#include <folly/Portability.h>
 
 /**
  * Code that aids in storing data aligned on block (possibly cache-line)

diff --git a/folly/PicoSpinLock.h b/folly/PicoSpinLock.h
index 485050f136c9ee895af8e28a3d2111583a49b9da..f0a7d12e32c730d824d9ecdd7109a5f7dde32d81 100644 (file)
--- a/folly/PicoSpinLock.h
+++ b/folly/PicoSpinLock.h
@@ -42,15 +42,16 @@
 #include <atomic>
 #include <cinttypes>
 #include <cstdlib>
-#include <folly/Portability.h>
 #include <mutex>
 #include <type_traits>
 
-#include <folly/detail/Sleeper.h>
 #include <glog/logging.h>
 
+#include <folly/Portability.h>
+#include <folly/detail/Sleeper.h>
+
 #if !FOLLY_X64 && !FOLLY_A64 && !FOLLY_PPC64
-# error "PicoSpinLock.h is currently x64, aarch64 and ppc64 only."
+#error "PicoSpinLock.h is currently x64, aarch64 and ppc64 only."
 #endif
 
 namespace folly {

diff --git a/folly/RWSpinLock.h b/folly/RWSpinLock.h
index cc4f480a4e29b123cafd16af71963bbd3b63f03e..21df0c0dae17ba31d48b94f6cb519de4603d568e 100644 (file)
--- a/folly/RWSpinLock.h
+++ b/folly/RWSpinLock.h
@@ -138,15 +138,13 @@ pthread_rwlock_t Read        728698     24us       101ns     7.28ms     194us
 #include <folly/Portability.h>
 #include <folly/portability/Asm.h>
 
-#if defined(__GNUC__) && \
-  (defined(__i386) || FOLLY_X64 || \
-   defined(ARCH_K8))
-# define RW_SPINLOCK_USE_X86_INTRINSIC_
-# include <x86intrin.h>
+#if defined(__GNUC__) && (defined(__i386) || FOLLY_X64 || defined(ARCH_K8))
+#define RW_SPINLOCK_USE_X86_INTRINSIC_
+#include <x86intrin.h>
 #elif defined(_MSC_VER) && defined(FOLLY_X64)
-# define RW_SPINLOCK_USE_X86_INTRINSIC_
+#define RW_SPINLOCK_USE_X86_INTRINSIC_
 #else
-# undef RW_SPINLOCK_USE_X86_INTRINSIC_
+#undef RW_SPINLOCK_USE_X86_INTRINSIC_
 #endif
 
 // iOS doesn't define _mm_cvtsi64_si128 and friends

diff --git a/folly/Random.cpp b/folly/Random.cpp
index 16f3e8b321bf2ca31e2cfe35a827fe1c75546ec5..524b9d06956fd3c14a760cae11a9d35924a3045b 100644 (file)
--- a/folly/Random.cpp
+++ b/folly/Random.cpp
@@ -16,10 +16,10 @@
 
 #include <folly/Random.h>
 
+#include <array>
 #include <atomic>
 #include <mutex>
 #include <random>
-#include <array>
 
 #include <folly/CallOnce.h>
 #include <folly/File.h>
@@ -31,7 +31,7 @@
 #include <glog/logging.h>
 
 #ifdef _MSC_VER
-# include <wincrypt.h> // @manual
+#include <wincrypt.h> // @manual
 #endif
 
 namespace folly {

diff --git a/folly/Random.h b/folly/Random.h
index 52f1f17c39e0ab8a26f40c2420463d5a1416dc50..0042176b68d474c2a73d8e9a20d18bf49ae105a9 100644 (file)
--- a/folly/Random.h
+++ b/folly/Random.h
@@ -17,9 +17,10 @@
 #pragma once
 #define FOLLY_RANDOM_H_
 
-#include <type_traits>
+#include <cstdint>
 #include <random>
-#include <stdint.h>
+#include <type_traits>
+
 #include <folly/Portability.h>
 
 #if FOLLY_HAVE_EXTRANDOM_SFMT19937

diff --git a/folly/SingletonThreadLocal.h b/folly/SingletonThreadLocal.h
index a4bb462735c92de527cccf96ce670fe5a765a58e..d14878bf98759541ff1dc70217be26db0746fe4c 100644 (file)
--- a/folly/SingletonThreadLocal.h
+++ b/folly/SingletonThreadLocal.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <folly/ThreadLocal.h>
 #include <folly/Singleton.h>
+#include <folly/ThreadLocal.h>
 
 namespace folly {
 

diff --git a/folly/SocketAddress.cpp b/folly/SocketAddress.cpp
index 2d12d787e74ae2d4c630b716063a29f9935ad039..4858ab503128151c0e8add97c21fb05c75cca783 100644 (file)
--- a/folly/SocketAddress.cpp
+++ b/folly/SocketAddress.cpp
@@ -20,18 +20,19 @@
 
 #include <folly/SocketAddress.h>
 
-#include <folly/CppAttributes.h>
-#include <folly/Exception.h>
-#include <folly/Hash.h>
-
-#include <boost/functional/hash.hpp>
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
+#include <cerrno>
+#include <cstdio>
+#include <cstring>
 #include <sstream>
 #include <string>
 #include <system_error>
 
+#include <boost/functional/hash.hpp>
+
+#include <folly/CppAttributes.h>
+#include <folly/Exception.h>
+#include <folly/Hash.h>
+
 namespace {
 
 /**

diff --git a/folly/SparseByteSet.h b/folly/SparseByteSet.h
index 04a03eb8e411b1fb923e75264f35622e847d56cb..f6393b0ad9768a2ff8bd6e8a6552c3cfd199e72b 100644 (file)
--- a/folly/SparseByteSet.h
+++ b/folly/SparseByteSet.h
@@ -17,6 +17,7 @@
 #pragma once
 
 #include <cstdint>
+
 #include <glog/logging.h>
 
 namespace folly {

diff --git a/folly/String-inl.h b/folly/String-inl.h
index 8baf8f85690c6fe5970f1903c9735a81b153e0ba..c28b6e5dd4ccfae8f95697c144222d3f4ed87e66 100644 (file)
--- a/folly/String-inl.h
+++ b/folly/String-inl.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <stdexcept>
 #include <iterator>
+#include <stdexcept>
 
 #include <folly/CppAttributes.h>
 

diff --git a/folly/String.cpp b/folly/String.cpp
index af86c668f3135105fffc16877d8393eef1f6d917..ffc956d68206149419e32de52c54508f1d5a8931 100644 (file)
--- a/folly/String.cpp
+++ b/folly/String.cpp
@@ -16,17 +16,17 @@
 
 #include <folly/String.h>
 
-#include <folly/ScopeGuard.h>
-
+#include <cctype>
 #include <cerrno>
 #include <cstdarg>
 #include <cstring>
-#include <stdexcept>
 #include <iterator>
-#include <cctype>
-#include <string.h>
+#include <stdexcept>
+
 #include <glog/logging.h>
 
+#include <folly/ScopeGuard.h>
+
 namespace folly {
 
 static inline bool is_oddspace(char c) {

diff --git a/folly/String.h b/folly/String.h
index 80d3e232375aa9c91d6dadbd2187748ca6d0db5b..c57a255b3f1f857b76afd0c32c92066df2496008 100644 (file)
--- a/folly/String.h
+++ b/folly/String.h
@@ -17,15 +17,15 @@
 #pragma once
 #define FOLLY_STRING_H_
 
+#include <cstdarg>
 #include <exception>
-#include <stdarg.h>
 #include <string>
+#include <unordered_map>
+#include <unordered_set>
 #include <vector>
-#include <boost/type_traits.hpp>
-#include <boost/regex/pending/unicode_iterator.hpp>
 
-#include <unordered_set>
-#include <unordered_map>
+#include <boost/regex/pending/unicode_iterator.hpp>
+#include <boost/type_traits.hpp>
 
 #include <folly/Conv.h>
 #include <folly/ExceptionString.h>

diff --git a/folly/Subprocess.cpp b/folly/Subprocess.cpp
index 52dad4350bc91eec3f15eb0a21be3af18e3f5ca6..1c9eade3f9e34000b26d60ea54ded2667851d02c 100644 (file)
--- a/folly/Subprocess.cpp
+++ b/folly/Subprocess.cpp
@@ -25,8 +25,8 @@
 #endif
 #include <fcntl.h>
 
-#include <array>
 #include <algorithm>
+#include <array>
 #include <system_error>
 
 #include <boost/container/flat_set.hpp>

diff --git a/folly/Subprocess.h b/folly/Subprocess.h
index ea2a062afd16dd12acbc97ebfefa708c52d6070c..98f79d282bb2f5dfd8568ebba8e491141851b946 100644 (file)
--- a/folly/Subprocess.h
+++ b/folly/Subprocess.h
@@ -93,8 +93,9 @@
 
 #pragma once
 
-#include <sys/types.h>
 #include <signal.h>
+#include <sys/types.h>
+
 #if __APPLE__
 #include <sys/wait.h>
 #else
@@ -102,8 +103,8 @@
 #endif
 
 #include <exception>
-#include <vector>
 #include <string>
+#include <vector>
 
 #include <boost/container/flat_map.hpp>
 

diff --git a/folly/TimeoutQueue.h b/folly/TimeoutQueue.h
index abea245812558fd61e187c9ea345697da7b7f05b..a20998b088560f5319e9b9ee391a3ecf732eff6d 100644 (file)
--- a/folly/TimeoutQueue.h
+++ b/folly/TimeoutQueue.h
@@ -27,12 +27,13 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <functional>
-#include <boost/multi_index_container.hpp>
+
 #include <boost/multi_index/indexed_by.hpp>
-#include <boost/multi_index/ordered_index.hpp>
 #include <boost/multi_index/member.hpp>
+#include <boost/multi_index/ordered_index.hpp>
+#include <boost/multi_index_container.hpp>
 
 namespace folly {
 

diff --git a/folly/Traits.h b/folly/Traits.h
index cc30fad2cf8c7964817e17aaa2bd76c90cf15b02..03442bea179d8453d02fe9b8da31308576314402 100644 (file)
--- a/folly/Traits.h
+++ b/folly/Traits.h
@@ -18,10 +18,10 @@
 
 #pragma once
 
-#include <memory>
+#include <functional>
 #include <limits>
+#include <memory>
 #include <type_traits>
-#include <functional>
 
 #include <folly/Portability.h>
 

diff --git a/folly/Uri.cpp b/folly/Uri.cpp
index 03fe3a06c3620b55c1a15b3bbc497a494ddf8d19..57ddfb42df495f9fc594582846bd2e471a94f8e4 100644 (file)
--- a/folly/Uri.cpp
+++ b/folly/Uri.cpp
@@ -16,7 +16,8 @@
 
 #include <folly/Uri.h>
 
-#include <ctype.h>
+#include <cctype>
+
 #include <boost/regex.hpp>
 
 namespace folly {

diff --git a/folly/build/GenerateFingerprintTables.cpp b/folly/build/GenerateFingerprintTables.cpp
index 3ae3cd649ebbbc3d43905642c6bbcc886341a942..e8e5b75fae0af29e0e8da304239b7eba3a7324d3 100644 (file)
--- a/folly/build/GenerateFingerprintTables.cpp
+++ b/folly/build/GenerateFingerprintTables.cpp
@@ -18,8 +18,8 @@
 #define __STDC_FORMAT_MACROS 1
 #endif
 
-#include <cstdio>
 #include <cinttypes>
+#include <cstdio>
 
 #include <string>
 

diff --git a/folly/detail/AtomicHashUtils.h b/folly/detail/AtomicHashUtils.h
index e9ca9d0be289ac04e7d0c4ce388e0871a4cbd619..49331bf35da83e64accabbfd4f61d1e48bb33f8e 100644 (file)
--- a/folly/detail/AtomicHashUtils.h
+++ b/folly/detail/AtomicHashUtils.h
@@ -17,6 +17,7 @@
 #pragma once
 
 #include <thread>
+
 #include <folly/portability/Asm.h>
 
 // Some utilities used by AtomicHashArray and AtomicHashMap

diff --git a/folly/detail/AtomicUnorderedMapUtils.h b/folly/detail/AtomicUnorderedMapUtils.h
index 77fa735f4c39281cf3589bd08e06c340497d41af..83ef6672eedf037a1d0d93efbca52a7b4e908e6d 100644 (file)
--- a/folly/detail/AtomicUnorderedMapUtils.h
+++ b/folly/detail/AtomicUnorderedMapUtils.h
@@ -1,7 +1,23 @@
+/*
+ * Copyright 2004-present Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 #pragma once
 
 #include <atomic>
-#include <stdint.h>
+#include <cstdint>
 
 #include <folly/portability/SysMman.h>
 #include <folly/portability/Unistd.h>

diff --git a/folly/detail/BitIteratorDetail.h b/folly/detail/BitIteratorDetail.h
index 86cd6f53470d1cb55212ff2cef56900eb9bb6f8a..ee64ffe4bcfb1468d8ba6fc21619f27850779a96 100644 (file)
--- a/folly/detail/BitIteratorDetail.h
+++ b/folly/detail/BitIteratorDetail.h
@@ -18,6 +18,7 @@
 
 #include <iterator>
 #include <type_traits>
+
 #include <boost/iterator/iterator_adaptor.hpp>
 
 namespace folly {

diff --git a/folly/detail/DiscriminatedPtrDetail.h b/folly/detail/DiscriminatedPtrDetail.h
index 12ecbe6d5ae84cfc546ffd362c96195558df8d9c..8f0d70b8595d2acd0a2f0e55af2efd2018e79f98 100644 (file)
--- a/folly/detail/DiscriminatedPtrDetail.h
+++ b/folly/detail/DiscriminatedPtrDetail.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <utility>
 #include <type_traits>
+#include <utility>
 
 namespace folly {
 namespace dptr_detail {

diff --git a/folly/detail/Futex.h b/folly/detail/Futex.h
index bc24119227aa86d02c8612810120b7f0cd1139a6..8755041657c3ad77c1dccb868ab6a266c2239298 100644 (file)
--- a/folly/detail/Futex.h
+++ b/folly/detail/Futex.h
@@ -17,9 +17,10 @@
 #pragma once
 
 #include <atomic>
+#include <cassert>
 #include <chrono>
 #include <limits>
-#include <assert.h>
+
 #include <boost/noncopyable.hpp>
 
 #include <folly/portability/Unistd.h>

diff --git a/folly/detail/IPAddress.h b/folly/detail/IPAddress.h
index 28dbfd89bf505f502cbf566632a55634e8c443fc..bc13a2ecb5ea4910474227c43e30e6d68e9b2ec8 100644 (file)
--- a/folly/detail/IPAddress.h
+++ b/folly/detail/IPAddress.h
@@ -16,8 +16,10 @@
 
 #pragma once
 
-#include <string>
 #include <sys/types.h>
+
+#include <string>
+
 #include <folly/portability/Sockets.h>
 
 namespace folly { namespace detail {

diff --git a/folly/detail/MemoryIdler.h b/folly/detail/MemoryIdler.h
index f6694fa5c8d2ad91af5655a01788f9b1f25eaf07..37c721383606fb5eeee08dd3db51222d3dc3abdb 100644 (file)
--- a/folly/detail/MemoryIdler.h
+++ b/folly/detail/MemoryIdler.h
@@ -18,6 +18,7 @@
 
 #include <atomic>
 #include <chrono>
+
 #include <folly/AtomicStruct.h>
 #include <folly/Hash.h>
 #include <folly/ThreadId.h>

diff --git a/folly/detail/RangeCommon.cpp b/folly/detail/RangeCommon.cpp
index f681aac4ad1f20618d32ab7b2c67e7458d81c5a9..fa78f283b971a4c32019dc1db6a1a91471d1f797 100644 (file)
--- a/folly/detail/RangeCommon.cpp
+++ b/folly/detail/RangeCommon.cpp
@@ -17,6 +17,7 @@
 #include <folly/detail/RangeCommon.h>
 
 #include <bitset>
+
 #include <folly/SparseByteSet.h>
 
 namespace folly {

diff --git a/folly/detail/RangeCommon.h b/folly/detail/RangeCommon.h
index 1777fd65cfab49ba7febafbe5f32e7be00a91d40..ce5325eb741f019665259365a546ffb370cf2ee6 100644 (file)
--- a/folly/detail/RangeCommon.h
+++ b/folly/detail/RangeCommon.h
@@ -18,7 +18,9 @@
 
 #include <algorithm>
 #include <string>
+
 #include <glog/logging.h>
+
 #include <folly/Likely.h>
 
 namespace folly {

diff --git a/folly/detail/RangeSse42.cpp b/folly/detail/RangeSse42.cpp
index fc9a759f3cf3be984cc4c35c9a0b38747e2126a6..84dcfb8523d7f23762539437300a21ac2b3bee78 100644 (file)
--- a/folly/detail/RangeSse42.cpp
+++ b/folly/detail/RangeSse42.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-#include "RangeSse42.h"
+#include <folly/detail/RangeSse42.h>
 
 #include <glog/logging.h>
+
 #include <folly/Portability.h>
 
 //  Essentially, two versions of this file: one with an SSE42 implementation

diff --git a/folly/detail/RangeSse42.h b/folly/detail/RangeSse42.h
index 1ef87b5d836d43bb2bfe550c1f012989745696f7..1b74cfd3eee8b1ac1d5c4ee224a07b3742d7a2a6 100644 (file)
--- a/folly/detail/RangeSse42.h
+++ b/folly/detail/RangeSse42.h
@@ -17,6 +17,7 @@
 #pragma once
 
 #include <cstddef>
+
 #include <folly/detail/RangeCommon.h>
 
 namespace folly {

diff --git a/folly/detail/SlowFingerprint.h b/folly/detail/SlowFingerprint.h
index b0721fdef9f4df316d665e35d3d7470385b54111..6dcc9a7a15ee33de4c1f846b228d8fa5ccee034f 100644 (file)
--- a/folly/detail/SlowFingerprint.h
+++ b/folly/detail/SlowFingerprint.h
@@ -17,8 +17,8 @@
 #pragma once
 
 #include <folly/Fingerprint.h>
-#include <folly/detail/FingerprintPolynomial.h>
 #include <folly/Range.h>
+#include <folly/detail/FingerprintPolynomial.h>
 
 namespace folly {
 namespace detail {

diff --git a/folly/dynamic-inl.h b/folly/dynamic-inl.h
index 48666de3ac343efa7ec93e7bc6882e53e712400b..7db61c02f276e55c0e309a4ebe3fc61709197f66 100644 (file)
--- a/folly/dynamic-inl.h
+++ b/folly/dynamic-inl.h
@@ -17,11 +17,13 @@
 #pragma once
 
 #include <functional>
+
 #include <boost/iterator/iterator_adaptor.hpp>
 #include <boost/iterator/iterator_facade.hpp>
-#include <folly/Likely.h>
+
 #include <folly/Conv.h>
 #include <folly/Format.h>
+#include <folly/Likely.h>
 
 //////////////////////////////////////////////////////////////////////
 

diff --git a/folly/experimental/Bits.h b/folly/experimental/Bits.h
index 7e1d19b0c1621d859fe485862bf5759560c4b210..d4976720d24b5053989a44637baa717861196e8a 100644 (file)
--- a/folly/experimental/Bits.h
+++ b/folly/experimental/Bits.h
@@ -17,8 +17,9 @@
 #pragma once
 
 #include <cstddef>
-#include <type_traits>
 #include <limits>
+#include <type_traits>
+
 #include <glog/logging.h>
 
 #include <folly/Bits.h>

diff --git a/folly/experimental/DynamicParser-inl.h b/folly/experimental/DynamicParser-inl.h
index 890b324ca96285e3ea4f0e1223d7cdec87cbb053..106b8f96a9daa85aef04c075adf39646df0a7b92 100644 (file)
--- a/folly/experimental/DynamicParser-inl.h
+++ b/folly/experimental/DynamicParser-inl.h
@@ -24,7 +24,6 @@
  */
 #pragma once
 
-#include <folly/Conv.h>
 #include <boost/function_types/is_member_pointer.hpp>
 #include <boost/function_types/parameter_types.hpp>
 #include <boost/mpl/equal.hpp>
@@ -32,6 +31,8 @@
 #include <boost/mpl/transform.hpp>
 #include <boost/mpl/vector.hpp>
 
+#include <folly/Conv.h>
+
 namespace folly {
 
 // Auto-conversion of key/value based on callback signature, documented in

diff --git a/folly/experimental/DynamicParser.h b/folly/experimental/DynamicParser.h
index e3caf0c9138c4dc963a0550157c606cbfa5a7658..3994eb64199d1097775782e6fc846e6aff448bb2 100644 (file)
--- a/folly/experimental/DynamicParser.h
+++ b/folly/experimental/DynamicParser.h
@@ -24,8 +24,8 @@
  */
 #pragma once
 
-#include <folly/dynamic.h>
 #include <folly/ScopeGuard.h>
+#include <folly/dynamic.h>
 
 namespace folly {
 

diff --git a/folly/experimental/JSONSchema.cpp b/folly/experimental/JSONSchema.cpp
index 863f4107f812c7f24942cd81d63dd25a8a862405..570e2c76bab577e106401eda6a2a62bf27715a6d 100644 (file)
--- a/folly/experimental/JSONSchema.cpp
+++ b/folly/experimental/JSONSchema.cpp
@@ -21,8 +21,8 @@
 #include <folly/Conv.h>
 #include <folly/Memory.h>
 #include <folly/Optional.h>
-#include <folly/String.h>
 #include <folly/Singleton.h>
+#include <folly/String.h>
 #include <folly/json.h>
 
 namespace folly {

diff --git a/folly/experimental/JSONSchema.h b/folly/experimental/JSONSchema.h
index be3c1d6703fec048d4b3036d039b281172a143ba..e11a5a8c2f4aff99bdabc37a88f31736d43baa9f 100644 (file)
--- a/folly/experimental/JSONSchema.h
+++ b/folly/experimental/JSONSchema.h
@@ -17,8 +17,8 @@
 #pragma once
 
 #include <folly/ExceptionWrapper.h>
-#include <folly/dynamic.h>
 #include <folly/Range.h>
+#include <folly/dynamic.h>
 
 /**
  * Validation according to the draft v4 standard: http://json-schema.org/

diff --git a/folly/experimental/LockFreeRingBuffer.h b/folly/experimental/LockFreeRingBuffer.h
index 0e32e033ed716a22665c29e898b8f232672c1a22..6968c7fec64ea5e74f691d67dd9b58882b1a1795 100644 (file)
--- a/folly/experimental/LockFreeRingBuffer.h
+++ b/folly/experimental/LockFreeRingBuffer.h
@@ -17,12 +17,13 @@
 #pragma once
 
 #include <atomic>
-#include <boost/noncopyable.hpp>
 #include <cmath>
+#include <cstring>
 #include <memory>
-#include <string.h>
 #include <type_traits>
 
+#include <boost/noncopyable.hpp>
+
 #include <folly/Portability.h>
 #include <folly/detail/TurnSequencer.h>
 #include <folly/portability/TypeTraits.h>

diff --git a/folly/experimental/NestedCommandLineApp.cpp b/folly/experimental/NestedCommandLineApp.cpp
index 4b376df46644177db4479cf46f2b0399027101bd..19f86663ec3082dabfee51cf53f6403e2d71abfe 100644 (file)
--- a/folly/experimental/NestedCommandLineApp.cpp
+++ b/folly/experimental/NestedCommandLineApp.cpp
@@ -17,6 +17,7 @@
 #include <folly/experimental/NestedCommandLineApp.h>
 
 #include <iostream>
+
 #include <folly/FileUtil.h>
 #include <folly/Format.h>
 #include <folly/experimental/io/FsUtil.h>

diff --git a/folly/experimental/StringKeyedCommon.h b/folly/experimental/StringKeyedCommon.h
index e29d2c1bacedf1ffca18833e6ecc4ed981dcc9fa..416874dff41306a1c82c357f4ec6add6d9c91502 100644 (file)
--- a/folly/experimental/StringKeyedCommon.h
+++ b/folly/experimental/StringKeyedCommon.h
@@ -19,6 +19,7 @@
 #pragma once
 
 #include <memory>
+
 #include <folly/Range.h>
 
 namespace folly {

diff --git a/folly/experimental/StringKeyedMap.h b/folly/experimental/StringKeyedMap.h
index d8b822c74474365832b21c4ec421bc537019a9bf..4164cde4c4d31fec2a6897453513f75ff042ddcc 100644 (file)
--- a/folly/experimental/StringKeyedMap.h
+++ b/folly/experimental/StringKeyedMap.h
@@ -19,8 +19,9 @@
 #pragma once
 
 #include <initializer_list>
-#include <memory>
 #include <map>
+#include <memory>
+
 #include <folly/Range.h>
 #include <folly/experimental/StringKeyedCommon.h>
 

diff --git a/folly/experimental/StringKeyedSet.h b/folly/experimental/StringKeyedSet.h
index 2b3f8f3e11a7dc1c22bf48dcfaeca1e32318df42..699124dd2bc07859fa9cfc98730da57199aa5564 100644 (file)
--- a/folly/experimental/StringKeyedSet.h
+++ b/folly/experimental/StringKeyedSet.h
@@ -21,6 +21,7 @@
 #include <initializer_list>
 #include <memory>
 #include <set>
+
 #include <folly/Range.h>
 #include <folly/experimental/StringKeyedCommon.h>
 

diff --git a/folly/experimental/TestUtil.cpp b/folly/experimental/TestUtil.cpp
index d05dafe8a27e27a4c1aacc3852ad1f587fcdf1fb..d0f39b940b4d845c3b66f50df82a7444f18c0c66 100644 (file)
--- a/folly/experimental/TestUtil.cpp
+++ b/folly/experimental/TestUtil.cpp
@@ -16,10 +16,11 @@
 
 #include <folly/experimental/TestUtil.h>
 
-#include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 
 #include <boost/regex.hpp>
+
 #include <folly/Exception.h>
 #include <folly/File.h>
 #include <folly/FileUtil.h>

diff --git a/folly/experimental/TestUtil.h b/folly/experimental/TestUtil.h
index 1cc9f190799b28f6c9ead27e59cd760cb42a27a8..cc110feb91dd9706efd80028f6767a074bf8a11e 100644 (file)
--- a/folly/experimental/TestUtil.h
+++ b/folly/experimental/TestUtil.h
@@ -18,6 +18,7 @@
 
 #include <map>
 #include <string>
+
 #include <folly/Range.h>
 #include <folly/ScopeGuard.h>
 #include <folly/experimental/io/FsUtil.h>

diff --git a/folly/experimental/bser/Dump.cpp b/folly/experimental/bser/Dump.cpp
index 4a8d5b5110fa4978540676dc39e42af39d4cf669..461f38aed043ef3444766cadd0c80580f2615113 100644 (file)
--- a/folly/experimental/bser/Dump.cpp
+++ b/folly/experimental/bser/Dump.cpp
@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "Bser.h"
+
+#include <folly/experimental/bser/Bser.h>
+
 #include <folly/io/Cursor.h>
 
 using namespace folly;

diff --git a/folly/experimental/bser/Load.cpp b/folly/experimental/bser/Load.cpp
index e462ee491092c9ce8cea7d00491f3950d3e7367e..1c210817222d93d4889768ee7cc1a5573c1b2ba1 100644 (file)
--- a/folly/experimental/bser/Load.cpp
+++ b/folly/experimental/bser/Load.cpp
@@ -13,9 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "Bser.h"
-#include <folly/io/Cursor.h>
+
+#include <folly/experimental/bser/Bser.h>
+
 #include <folly/String.h>
+#include <folly/io/Cursor.h>
 
 using namespace folly;
 using folly::io::Cursor;

diff --git a/folly/experimental/bser/test/BserTest.cpp b/folly/experimental/bser/test/BserTest.cpp
index fec32c3e590a07418ddb810af4e9d726ae8de15c..5f03dd81d375c7a1cc1c9abc31fbbe982bb32369 100644 (file)
--- a/folly/experimental/bser/test/BserTest.cpp
+++ b/folly/experimental/bser/test/BserTest.cpp
@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include <folly/experimental/bser/Bser.h>
+
 #include <folly/String.h>
 #include <folly/portability/GTest.h>
 

diff --git a/folly/experimental/hazptr/test/HazptrTest.cpp b/folly/experimental/hazptr/test/HazptrTest.cpp
index a669db8b69b1def884506a801fb43d5760199df9..d8ca18dacf7ad406bab73c24aeadbd07d3b021b6 100644 (file)
--- a/folly/experimental/hazptr/test/HazptrTest.cpp
+++ b/folly/experimental/hazptr/test/HazptrTest.cpp
@@ -17,13 +17,13 @@
 #define HAZPTR_STATS true
 #define HAZPTR_SCAN_THRESHOLD 10
 
-#include <folly/experimental/hazptr/test/HazptrUse1.h>
-#include <folly/experimental/hazptr/test/HazptrUse2.h>
+#include <folly/experimental/hazptr/debug.h>
 #include <folly/experimental/hazptr/example/LockFreeLIFO.h>
 #include <folly/experimental/hazptr/example/SWMRList.h>
 #include <folly/experimental/hazptr/example/WideCAS.h>
-#include <folly/experimental/hazptr/debug.h>
 #include <folly/experimental/hazptr/hazptr.h>
+#include <folly/experimental/hazptr/test/HazptrUse1.h>
+#include <folly/experimental/hazptr/test/HazptrUse2.h>
 
 #include <folly/portability/GFlags.h>
 #include <folly/portability/GTest.h>

diff --git a/folly/experimental/io/AsyncIO.h b/folly/experimental/io/AsyncIO.h
index 3af437a0b00ab5ef6d6feaee1dbc612ea454d1ea..6dfb8e6b1b3581b62640bfa23558a23f16d595cd 100644 (file)
--- a/folly/experimental/io/AsyncIO.h
+++ b/folly/experimental/io/AsyncIO.h
@@ -17,7 +17,6 @@
 #pragma once
 
 #include <sys/types.h>
-#include <libaio.h>
 
 #include <atomic>
 #include <cstdint>
@@ -29,6 +28,7 @@
 #include <vector>
 
 #include <boost/noncopyable.hpp>
+#include <libaio.h>
 
 #include <folly/Portability.h>
 #include <folly/Range.h>

diff --git a/folly/experimental/io/HugePages.cpp b/folly/experimental/io/HugePages.cpp
index ad15d3597f3c41f262ef068a546447c45b14a851..fbbd77087624e131ac7901ce443d4830accbfc69 100644 (file)
--- a/folly/experimental/io/HugePages.cpp
+++ b/folly/experimental/io/HugePages.cpp
@@ -16,9 +16,9 @@
 
 #include <folly/experimental/io/HugePages.h>
 
+#include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <fcntl.h>
 
 #include <cctype>
 #include <cstring>

diff --git a/folly/experimental/io/test/AsyncIOTest.cpp b/folly/experimental/io/test/AsyncIOTest.cpp
index d7b3273224af0047f7db824e63b64c4b295f7ed4..05644c716899174e71bc6467c6e92d933c40e760 100644 (file)
--- a/folly/experimental/io/test/AsyncIOTest.cpp
+++ b/folly/experimental/io/test/AsyncIOTest.cpp
@@ -16,12 +16,12 @@
 
 #include <folly/experimental/io/AsyncIO.h>
 
+#include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <fcntl.h>
 
-#include <cstdlib>
 #include <cstdio>
+#include <cstdlib>
 #include <memory>
 #include <random>
 #include <thread>
@@ -29,9 +29,9 @@
 
 #include <glog/logging.h>
 
-#include <folly/experimental/io/FsUtil.h>
 #include <folly/ScopeGuard.h>
 #include <folly/String.h>
+#include <folly/experimental/io/FsUtil.h>
 #include <folly/portability/GTest.h>
 #include <folly/portability/Sockets.h>
 

diff --git a/folly/experimental/symbolizer/Dwarf.h b/folly/experimental/symbolizer/Dwarf.h
index 8aec70cdff6f7133da286febc279a964075bdbfd..aae1b3a5dd5e4857e266416c60d79d31493868d6 100644 (file)
--- a/folly/experimental/symbolizer/Dwarf.h
+++ b/folly/experimental/symbolizer/Dwarf.h
@@ -20,8 +20,8 @@
 
 #include <boost/variant.hpp>
 
-#include <folly/experimental/symbolizer/Elf.h>
 #include <folly/Range.h>
+#include <folly/experimental/symbolizer/Elf.h>
 
 namespace folly {
 namespace symbolizer {

diff --git a/folly/experimental/symbolizer/Elf.h b/folly/experimental/symbolizer/Elf.h
index b16c87186330689ddf2d92e0357a4e21a2ff4413..f0a0bd7b874181cc29e60c474b1ca5c9b5a356c6 100644 (file)
--- a/folly/experimental/symbolizer/Elf.h
+++ b/folly/experimental/symbolizer/Elf.h
@@ -19,10 +19,10 @@
 #pragma once
 #define FOLLY_EXPERIMENTAL_SYMBOLIZER_ELF_H_
 
-#include <stdio.h>
 #include <elf.h>
-#include <link.h>  // For ElfW()
+#include <link.h> // For ElfW()
 
+#include <cstdio>
 #include <stdexcept>
 #include <system_error>
 

diff --git a/folly/experimental/symbolizer/ElfCache.h b/folly/experimental/symbolizer/ElfCache.h
index 135b6e9a21f14b2096e28d924dff9292697f7834..af4f4c447287870ddb25428a737d8faa79df11e5 100644 (file)
--- a/folly/experimental/symbolizer/ElfCache.h
+++ b/folly/experimental/symbolizer/ElfCache.h
@@ -16,17 +16,17 @@
 
 #pragma once
 
+#include <climits> // for PATH_MAX
 #include <cstring>
-#include <limits.h>  // for PATH_MAX
 #include <memory>
 #include <mutex>
 #include <string>
-#include <vector>
 #include <unordered_map>
+#include <vector>
 
-#include <boost/operators.hpp>
 #include <boost/container/flat_map.hpp>
 #include <boost/intrusive/list.hpp>
+#include <boost/operators.hpp>
 #include <glog/logging.h>
 
 #include <folly/Hash.h>

diff --git a/folly/experimental/symbolizer/Symbolizer.cpp b/folly/experimental/symbolizer/Symbolizer.cpp
index 56d8e2ac1395dafd09366560f3fe16f06cb64570..abfc64cfd6ff00b35c0639678244825e0c3bc2f7 100644 (file)
--- a/folly/experimental/symbolizer/Symbolizer.cpp
+++ b/folly/experimental/symbolizer/Symbolizer.cpp
@@ -16,11 +16,12 @@
 
 #include <folly/experimental/symbolizer/Symbolizer.h>
 
+#include <link.h>
+
+#include <climits>
 #include <cstdio>
 #include <cstdlib>
 #include <iostream>
-#include <limits.h>
-#include <link.h>
 
 #ifdef __GNUC__
 #include <ext/stdio_filebuf.h>

diff --git a/folly/experimental/symbolizer/Symbolizer.h b/folly/experimental/symbolizer/Symbolizer.h
index 772b11d0ef2570c041f76d9c1580473ebee1bc83..73e7dfdd336a4a2095c0a47e18b642a7eeff5e0a 100644 (file)
--- a/folly/experimental/symbolizer/Symbolizer.h
+++ b/folly/experimental/symbolizer/Symbolizer.h
@@ -24,11 +24,11 @@
 #include <folly/FBString.h>
 #include <folly/Range.h>
 #include <folly/String.h>
-#include <folly/io/IOBuf.h>
+#include <folly/experimental/symbolizer/Dwarf.h>
 #include <folly/experimental/symbolizer/Elf.h>
 #include <folly/experimental/symbolizer/ElfCache.h>
-#include <folly/experimental/symbolizer/Dwarf.h>
 #include <folly/experimental/symbolizer/StackTrace.h>
+#include <folly/io/IOBuf.h>
 
 namespace folly {
 namespace symbolizer {

diff --git a/folly/experimental/symbolizer/test/SignalHandlerTest.cpp b/folly/experimental/symbolizer/test/SignalHandlerTest.cpp
index c2ae9e95407a3e3b94faaf7bf018ce6d27c12867..56c216fd01dde63107a2b0ca068b6cd0412c7977 100644 (file)
--- a/folly/experimental/symbolizer/test/SignalHandlerTest.cpp
+++ b/folly/experimental/symbolizer/test/SignalHandlerTest.cpp
@@ -17,9 +17,9 @@
 #include <folly/experimental/symbolizer/test/SignalHandlerTest.h>
 #include <folly/experimental/symbolizer/SignalHandler.h>
 
+#include <folly/CPortability.h>
 #include <folly/FileUtil.h>
 #include <folly/Range.h>
-#include <folly/CPortability.h>
 #include <folly/portability/GTest.h>
 
 namespace folly { namespace symbolizer { namespace test {

diff --git a/folly/experimental/test/BitsBenchmark.cpp b/folly/experimental/test/BitsBenchmark.cpp
index a0263388250fbf0afabc19d82e4e02a877f1ad14..7ece8e3c7a87743d2eec3e7895002dd0223de2bc 100644 (file)
--- a/folly/experimental/test/BitsBenchmark.cpp
+++ b/folly/experimental/test/BitsBenchmark.cpp
@@ -13,10 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include <atomic>
-#include <glog/logging.h>
-#include <random>
 #include <memory>
+#include <random>
+
+#include <glog/logging.h>
 
 #include <folly/Benchmark.h>
 #include <folly/experimental/Bits.h>

diff --git a/folly/experimental/test/CodingTestUtils.h b/folly/experimental/test/CodingTestUtils.h
index f7c3dfe3ff394bdbc4501535823ffe5928224b0f..ffbfd53e1aeab4a6dc47a788c8e9b5baad41e186 100644 (file)
--- a/folly/experimental/test/CodingTestUtils.h
+++ b/folly/experimental/test/CodingTestUtils.h
@@ -21,8 +21,9 @@
 #include <limits>
 #include <random>
 #include <string>
-#include <vector>
 #include <unordered_set>
+#include <vector>
+
 #include <glog/logging.h>
 
 #include <folly/portability/GTest.h>

diff --git a/folly/experimental/test/EventCountTest.cpp b/folly/experimental/test/EventCountTest.cpp
index 17da4644884459a4b4a705453fde25960aef553b..80fdcc473769baa300a1761609e5cfdac1f366d6 100644 (file)
--- a/folly/experimental/test/EventCountTest.cpp
+++ b/folly/experimental/test/EventCountTest.cpp
@@ -21,6 +21,7 @@
 #include <random>
 #include <thread>
 #include <vector>
+
 #include <glog/logging.h>
 
 #include <folly/Random.h>

diff --git a/folly/experimental/test/FlatCombiningPriorityQueueTest.cpp b/folly/experimental/test/FlatCombiningPriorityQueueTest.cpp
index 0085f88cee1f1959ad1f6cfbf259bef8f29232a4..cb21b809dc38dd9a7db4f78ffa9507a41fc93c88 100644 (file)
--- a/folly/experimental/test/FlatCombiningPriorityQueueTest.cpp
+++ b/folly/experimental/test/FlatCombiningPriorityQueueTest.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <folly/experimental/FlatCombiningPriorityQueue.h>
 #include <folly/Benchmark.h>
+#include <folly/experimental/FlatCombiningPriorityQueue.h>
 #include <folly/portability/GTest.h>
 #include <glog/logging.h>
 

diff --git a/folly/experimental/test/LockFreeRingBufferTest.cpp b/folly/experimental/test/LockFreeRingBufferTest.cpp
index dd1567fd7790b4b2b13aea8d037a0faf17a7fcc7..7f48b9cf59ae1a25ea2a49a08ff7079f6ad3bece 100644 (file)
--- a/folly/experimental/test/LockFreeRingBufferTest.cpp
+++ b/folly/experimental/test/LockFreeRingBufferTest.cpp
@@ -18,8 +18,8 @@
 #include <thread>
 
 #include <folly/experimental/LockFreeRingBuffer.h>
-#include <folly/test/DeterministicSchedule.h>
 #include <folly/portability/GTest.h>
+#include <folly/test/DeterministicSchedule.h>
 
 namespace folly {
 

diff --git a/folly/experimental/test/NestedCommandLineAppExample.cpp b/folly/experimental/test/NestedCommandLineAppExample.cpp
index e1d7f4308b2daf68bee6c4cc7773615416565aab..42ae2b125db63c3844d3fb2bc432aa24b2168f0c 100644 (file)
--- a/folly/experimental/test/NestedCommandLineAppExample.cpp
+++ b/folly/experimental/test/NestedCommandLineAppExample.cpp
@@ -19,8 +19,8 @@
 // Implements two commands: "cat" and "echo", which behave similarly to their
 // Unix homonyms.
 
-#include <folly/String.h>
 #include <folly/ScopeGuard.h>
+#include <folly/String.h>
 #include <folly/experimental/NestedCommandLineApp.h>
 #include <folly/experimental/ProgramOptions.h>
 

diff --git a/folly/experimental/test/ProgramOptionsTestHelper.cpp b/folly/experimental/test/ProgramOptionsTestHelper.cpp
index 172343ef03d5dcbfcab29f3be5f3228a3ae3ee7b..12691b877b2974b7491361da78dcc44cbe08911f 100644 (file)
--- a/folly/experimental/test/ProgramOptionsTestHelper.cpp
+++ b/folly/experimental/test/ProgramOptionsTestHelper.cpp
@@ -15,9 +15,11 @@
  */
 
 #include <iostream>
+
+#include <glog/logging.h>
+
 #include <folly/Conv.h>
 #include <folly/experimental/ProgramOptions.h>
-#include <glog/logging.h>
 
 DEFINE_bool(flag_bool_true, true, "Bool with true default value");
 DEFINE_bool(flag_bool_false, false, "Bool with false default value");

diff --git a/folly/experimental/test/ReadMostlySharedPtrTest.cpp b/folly/experimental/test/ReadMostlySharedPtrTest.cpp
index ba85eb0ba47ee63c4b29a5349f9a93240e483c2f..089961159c206977994f0b40f51ef01f0fe3fd2e 100644 (file)
--- a/folly/experimental/test/ReadMostlySharedPtrTest.cpp
+++ b/folly/experimental/test/ReadMostlySharedPtrTest.cpp
@@ -16,12 +16,12 @@
 /* -*- Mode: C++; tab-width: 2; c-basic-offset: 2; indent-tabs-mode: nil -*- */
 
 #include <atomic>
-#include <thread>
-#include <mutex>
-#include <folly/Memory.h>
 #include <condition_variable>
+#include <mutex>
+#include <thread>
 
 #include <folly/Baton.h>
+#include <folly/Memory.h>
 #include <folly/experimental/RCURefCount.h>
 #include <folly/experimental/ReadMostlySharedPtr.h>
 #include <folly/portability/GTest.h>

diff --git a/folly/futures/Future-inl.h b/folly/futures/Future-inl.h
index 84bf33a1e87068bab6d1fc6ce30786735d475331..df837c54ba56eb69b93cf2dfe78a0e35fa576436 100644 (file)
--- a/folly/futures/Future-inl.h
+++ b/folly/futures/Future-inl.h
@@ -21,11 +21,12 @@
 #include <chrono>
 #include <random>
 #include <thread>
+
 #include <folly/Baton.h>
 #include <folly/Optional.h>
 #include <folly/Random.h>
-#include <folly/futures/detail/Core.h>
 #include <folly/futures/Timekeeper.h>
+#include <folly/futures/detail/Core.h>
 
 #if FOLLY_MOBILE || defined(__APPLE__)
 #define FOLLY_FUTURE_USING_FIBER 0

diff --git a/folly/futures/Future.cpp b/folly/futures/Future.cpp
index 6fdaa25253fb49f1deac982361f1687fe6e38a93..e53331b45bd500899c4164bad2fa9f4f8bc9715f 100644 (file)
--- a/folly/futures/Future.cpp
+++ b/folly/futures/Future.cpp
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include <folly/futures/Future.h>
-#include <folly/futures/ThreadWheelTimekeeper.h>
 #include <folly/Likely.h>
+#include <folly/futures/ThreadWheelTimekeeper.h>
 
 namespace folly {
 

diff --git a/folly/futures/ManualExecutor.h b/folly/futures/ManualExecutor.h
index 76847e2cce496741d473469c38d83a278d33dbd8..689111eb62acf685dea5612c469b085b189790fd 100644 (file)
--- a/folly/futures/ManualExecutor.h
+++ b/folly/futures/ManualExecutor.h
@@ -15,13 +15,15 @@
  */
 
 #pragma once
-#include <folly/LifoSem.h>
-#include <folly/futures/DrivableExecutor.h>
-#include <folly/futures/ScheduledExecutor.h>
+
+#include <cstdio>
 #include <memory>
 #include <mutex>
 #include <queue>
-#include <cstdio>
+
+#include <folly/LifoSem.h>
+#include <folly/futures/DrivableExecutor.h>
+#include <folly/futures/ScheduledExecutor.h>
 
 namespace folly {
   /// A ManualExecutor only does work when you turn the crank, by calling

diff --git a/folly/futures/SharedPromise.h b/folly/futures/SharedPromise.h
index 51a4a179aa70fb85789fb11e8f57571f1f985696..2e466b1aa6e8940ff2e38e592918c258e55f746d 100644 (file)
--- a/folly/futures/SharedPromise.h
+++ b/folly/futures/SharedPromise.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <folly/futures/Promise.h>
 #include <folly/Portability.h>
+#include <folly/futures/Promise.h>
 
 namespace folly {
 

diff --git a/folly/futures/Timekeeper.h b/folly/futures/Timekeeper.h
index 4214229ae047b7917ff25d36162e2dfddb03db9b..f5223f43f80a5384c49a4dd8f4a2c3f20efd90a8 100644 (file)
--- a/folly/futures/Timekeeper.h
+++ b/folly/futures/Timekeeper.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <folly/futures/detail/Types.h>
 #include <folly/Unit.h>
+#include <folly/futures/detail/Types.h>
 
 namespace folly {
 

diff --git a/folly/futures/detail/FSM.h b/folly/futures/detail/FSM.h
index fc3bb117ea872cd5c3a2361a7ed76e6289ee19e8..a9076adf59f8966e91aa05004430db417a69a5c7 100644 (file)
--- a/folly/futures/detail/FSM.h
+++ b/folly/futures/detail/FSM.h
@@ -18,6 +18,7 @@
 
 #include <atomic>
 #include <mutex>
+
 #include <folly/MicroSpinLock.h>
 
 namespace folly { namespace detail {

diff --git a/folly/futures/exercises/01-Values.cpp b/folly/futures/exercises/01-Values.cpp
index 3f6ea12ba170709e33e960084732ead9e40853c9..97b4af1bd48cfaead86e8b66ed85662bc3ec05d3 100644 (file)
--- a/folly/futures/exercises/01-Values.cpp
+++ b/folly/futures/exercises/01-Values.cpp
@@ -13,9 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "Koan.h"
+
 #include <folly/futures/Future.h>
 
+#include "Koan.h"
+
 using folly::Future;
 using folly::makeFuture;
 

diff --git a/folly/futures/exercises/Koan.h b/folly/futures/exercises/Koan.h
index 95523b2a07fc9f07571a8860040c956227c8607f..8b0f9133f04b5f82185d1b767cacee933e893a7f 100644 (file)
--- a/folly/futures/exercises/Koan.h
+++ b/folly/futures/exercises/Koan.h
@@ -13,7 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #pragma once
-#include <folly/Portability.h>
-#include <gtest/gtest.h>
+
 #include <gflags/gflags.h>
+#include <gtest/gtest.h>
+
+#include <folly/Portability.h>

diff --git a/folly/futures/test/CollectTest.cpp b/folly/futures/test/CollectTest.cpp
index 908fa3cdc6a6deb362d7a345f16fad90bc066ce2..c01fadf42108edfee827a0ae5c7435a2253ec474 100644 (file)
--- a/folly/futures/test/CollectTest.cpp
+++ b/folly/futures/test/CollectTest.cpp
@@ -18,10 +18,10 @@
 
 #include <boost/thread/barrier.hpp>
 
-#include <folly/futures/Future.h>
 #include <folly/Random.h>
-#include <folly/small_vector.h>
+#include <folly/futures/Future.h>
 #include <folly/portability/GTest.h>
+#include <folly/small_vector.h>
 
 using namespace folly;
 

diff --git a/folly/futures/test/ExecutorTest.cpp b/folly/futures/test/ExecutorTest.cpp
index d21f1079ce2d800df95bd35b9d71fc6834bafc9d..d4b24e0974cf567cb838d9620494ce3efac2232c 100644 (file)
--- a/folly/futures/test/ExecutorTest.cpp
+++ b/folly/futures/test/ExecutorTest.cpp
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
+#include <folly/Baton.h>
 #include <folly/futures/Future.h>
 #include <folly/futures/InlineExecutor.h>
 #include <folly/futures/ManualExecutor.h>
 #include <folly/futures/QueuedImmediateExecutor.h>
-#include <folly/Baton.h>
 #include <folly/portability/GTest.h>
 
 using namespace folly;

diff --git a/folly/futures/test/FutureTest.cpp b/folly/futures/test/FutureTest.cpp
index 4dd3f2dc574239d9c6c5d76c5b567c0fbe6e23cb..6db394d2a27fd4503db21d8042b546663aed7c1c 100644 (file)
--- a/folly/futures/test/FutureTest.cpp
+++ b/folly/futures/test/FutureTest.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include <folly/futures/Future.h>
-#include <folly/Unit.h>
-#include <folly/Memory.h>
+#include <folly/Baton.h>
 #include <folly/Executor.h>
+#include <folly/Memory.h>
+#include <folly/Unit.h>
 #include <folly/dynamic.h>
-#include <folly/Baton.h>
+#include <folly/futures/Future.h>
 #include <folly/portability/GTest.h>
 
 #include <algorithm>

diff --git a/folly/futures/test/HeaderCompileTest.cpp b/folly/futures/test/HeaderCompileTest.cpp
index fd81b74e655a95b6a8797f5f900551ae207241df..927905fd005b76e374db744c71cd4d39e6bcf6d9 100644 (file)
--- a/folly/futures/test/HeaderCompileTest.cpp
+++ b/folly/futures/test/HeaderCompileTest.cpp
@@ -17,8 +17,8 @@
 // amazing what things can go wrong if you include things in an unexpected
 // order.
 #include <folly/Try.h>
-#include <folly/futures/Promise.h>
 #include <folly/futures/Future.h>
+#include <folly/futures/Promise.h>
 #include <folly/portability/GTest.h>
 
 TEST(Basic, compiles) {

diff --git a/folly/futures/test/InterruptTest.cpp b/folly/futures/test/InterruptTest.cpp
index 7e8f3298e407deb2c153d2a0aa637597e593db8d..7c51bb1e98af512a402bbb0ac5326c065bd62675 100644 (file)
--- a/folly/futures/test/InterruptTest.cpp
+++ b/folly/futures/test/InterruptTest.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+#include <folly/Baton.h>
 #include <folly/futures/Future.h>
 #include <folly/futures/Promise.h>
-#include <folly/Baton.h>
 #include <folly/portability/GTest.h>
 
 using namespace folly;

diff --git a/folly/futures/test/ViaTest.cpp b/folly/futures/test/ViaTest.cpp
index f843a0299bf7175b1ec61ba2f610a466dd4ef584..198c4f93048899436ff2386dfbcc52d682a0a4ab 100644 (file)
--- a/folly/futures/test/ViaTest.cpp
+++ b/folly/futures/test/ViaTest.cpp
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
+#include <thread>
+
+#include <folly/Baton.h>
+#include <folly/MPMCQueue.h>
+#include <folly/futures/DrivableExecutor.h>
 #include <folly/futures/Future.h>
 #include <folly/futures/InlineExecutor.h>
 #include <folly/futures/ManualExecutor.h>
-#include <folly/futures/DrivableExecutor.h>
-#include <folly/Baton.h>
-#include <folly/MPMCQueue.h>
 #include <folly/portability/GTest.h>
 
-#include <thread>
-
 using namespace folly;
 
 struct ManualWaiter : public DrivableExecutor {

diff --git a/folly/futures/test/WaitTest.cpp b/folly/futures/test/WaitTest.cpp
index 85ff6174ca651560bb67fecec3a0eccf9ef880bd..57e4e172d2f9354e2be292d0f9dc982e23e30fac 100644 (file)
--- a/folly/futures/test/WaitTest.cpp
+++ b/folly/futures/test/WaitTest.cpp
@@ -16,9 +16,9 @@
 
 #include <queue>
 
+#include <folly/Baton.h>
 #include <folly/futures/Future.h>
 #include <folly/io/async/EventBase.h>
-#include <folly/Baton.h>
 #include <folly/portability/GTest.h>
 
 using namespace folly;

diff --git a/folly/gen/test/BaseBenchmark.cpp b/folly/gen/test/BaseBenchmark.cpp
index 07324b3eb09c5de4929c4c09f451ca92f6931b10..a059898f1156a882c7d54a20758dcf439267d098 100644 (file)
--- a/folly/gen/test/BaseBenchmark.cpp
+++ b/folly/gen/test/BaseBenchmark.cpp
@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include <atomic>
+
 #include <glog/logging.h>
 
 #include <folly/Benchmark.h>

diff --git a/folly/gen/test/CombineTest.cpp b/folly/gen/test/CombineTest.cpp
index 42c904051cb88ee073e1e5f5c2601a1d5099e399..da21cdcb886ff1f88e1bc2943a69fa4b5c6d2093 100644 (file)
--- a/folly/gen/test/CombineTest.cpp
+++ b/folly/gen/test/CombineTest.cpp
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 #include <string>
-#include <vector>
 #include <tuple>
+#include <vector>
 
-#include <folly/Range.h>
 #include <folly/FBVector.h>
+#include <folly/Range.h>
 #include <folly/gen/Base.h>
 #include <folly/gen/Combine.h>
 #include <folly/portability/GTest.h>

diff --git a/folly/gen/test/FileBenchmark.cpp b/folly/gen/test/FileBenchmark.cpp
index 64912aca00b750c659daea7f63e1273f513b3756..74693c51ed536d47cd2769e95852437b06f17b3f 100644 (file)
--- a/folly/gen/test/FileBenchmark.cpp
+++ b/folly/gen/test/FileBenchmark.cpp
@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include <thread>
+
 #include <glog/logging.h>
 
 #include <folly/Benchmark.h>

diff --git a/folly/gen/test/ParallelBenchmark.cpp b/folly/gen/test/ParallelBenchmark.cpp
index 28fdc7eb4768ed02b9c743d3d4dd976738f7e13c..9bced1ee34b50fef40b27cb936d050ff34094acb 100644 (file)
--- a/folly/gen/test/ParallelBenchmark.cpp
+++ b/folly/gen/test/ParallelBenchmark.cpp
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-#include <glog/logging.h>
-#include <iostream>
 #include <array>
-#include <vector>
 #include <future>
+#include <iostream>
+#include <vector>
+
+#include <glog/logging.h>
 
 #include <folly/gen/Base.h>
 #include <folly/gen/Parallel.h>

diff --git a/folly/gen/test/ParallelMapBenchmark.cpp b/folly/gen/test/ParallelMapBenchmark.cpp
index 0e2e7f740023850ba23a6b47024535671ae1924c..89e9f06d136289223625eda0fb418f899d082fda 100644 (file)
--- a/folly/gen/test/ParallelMapBenchmark.cpp
+++ b/folly/gen/test/ParallelMapBenchmark.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <atomic>
 #include <algorithm>
+#include <atomic>
 #include <thread>
 #include <vector>
 

diff --git a/folly/gen/test/ParallelTest.cpp b/folly/gen/test/ParallelTest.cpp
index 36bc4c968471e7ba6ef2ccf414707b312c25ffef..b90202c64acc16100963858b9daf5172aa8507f1 100644 (file)
--- a/folly/gen/test/ParallelTest.cpp
+++ b/folly/gen/test/ParallelTest.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include <glog/logging.h>
-
-#include <iostream>
 #include <array>
+#include <iostream>
 #include <vector>
 
+#include <glog/logging.h>
+
 #include <folly/gen/Base.h>
 #include <folly/gen/Parallel.h>
 #include <folly/portability/GTest.h>

diff --git a/folly/gen/test/StringBenchmark.cpp b/folly/gen/test/StringBenchmark.cpp
index c6de1ed43f003579c4dc94ea2d40891b44866529..df7dcec76dbdbf0e4583b449c59d18cf64a2ecf5 100644 (file)
--- a/folly/gen/test/StringBenchmark.cpp
+++ b/folly/gen/test/StringBenchmark.cpp
@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include <atomic>
+
 #include <glog/logging.h>
 
 #include <folly/Benchmark.h>

diff --git a/folly/io/Compression.cpp b/folly/io/Compression.cpp
index 98f332b85eb55d34f047d47ef51e7cd368369e16..cfa5318196e9f04bd29b46eb3e11610245d5eae7 100644 (file)
--- a/folly/io/Compression.cpp
+++ b/folly/io/Compression.cpp
@@ -27,8 +27,8 @@
 #include <glog/logging.h>
 
 #if FOLLY_HAVE_LIBSNAPPY
-#include <snappy.h>
 #include <snappy-sinksource.h>
+#include <snappy.h>
 #endif
 
 #if FOLLY_HAVE_LIBZ

diff --git a/folly/io/Cursor.cpp b/folly/io/Cursor.cpp
index c51ce6cc029093764307a551fd5aa912b0c89576..cd7807c1568941e1872406e9a428ce49ab3fe1a7 100644 (file)
--- a/folly/io/Cursor.cpp
+++ b/folly/io/Cursor.cpp
@@ -13,9 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include <folly/io/Cursor.h>
 
 #include <cstdio>
+
 #include <folly/ScopeGuard.h>
 
 namespace folly {

diff --git a/folly/io/Cursor.h b/folly/io/Cursor.h
index 4d61b4f5d98996ff9065b80577649787c329ff72..ac5ec91f1d4770ab4a253f1cd4011309156de3de 100644 (file)
--- a/folly/io/Cursor.h
+++ b/folly/io/Cursor.h
@@ -16,12 +16,12 @@
 
 #pragma once
 
-#include <assert.h>
+#include <cassert>
 #include <cstdarg>
+#include <cstring>
+#include <memory>
 #include <stdexcept>
-#include <string.h>
 #include <type_traits>
-#include <memory>
 
 #include <folly/Bits.h>
 #include <folly/Likely.h>

diff --git a/folly/io/IOBuf.cpp b/folly/io/IOBuf.cpp
index 5698606106d38da2ddb6734ebc8517254b916d86..a71ff32e2e3f8d94210ef865925cebf76e234815 100644 (file)
--- a/folly/io/IOBuf.cpp
+++ b/folly/io/IOBuf.cpp
@@ -20,6 +20,11 @@
 
 #include <folly/io/IOBuf.h>
 
+#include <cassert>
+#include <cstdint>
+#include <cstdlib>
+#include <stdexcept>
+
 #include <folly/Conv.h>
 #include <folly/Likely.h>
 #include <folly/Malloc.h>
@@ -28,11 +33,6 @@
 #include <folly/SpookyHashV2.h>
 #include <folly/io/Cursor.h>
 
-#include <stdexcept>
-#include <assert.h>
-#include <stdint.h>
-#include <stdlib.h>
-
 using std::unique_ptr;
 
 namespace {

diff --git a/folly/io/IOBuf.h b/folly/io/IOBuf.h
index 238c4ec69059b50dde57e22c718d74e33798beac..3e68f473991479359306d126bfa4b6969e987c39 100644 (file)
--- a/folly/io/IOBuf.h
+++ b/folly/io/IOBuf.h
@@ -22,8 +22,8 @@
 #include <cinttypes>
 #include <cstddef>
 #include <cstring>
-#include <memory>
 #include <limits>
+#include <memory>
 #include <type_traits>
 
 #include <boost/iterator/iterator_facade.hpp>

diff --git a/folly/io/RecordIO.h b/folly/io/RecordIO.h
index 0acb4a20696226d3dc3719dcb91b6bf67ad18ef1..856e329fdf715757be3da4823ecbef2c7f802bf4 100644 (file)
--- a/folly/io/RecordIO.h
+++ b/folly/io/RecordIO.h
@@ -31,8 +31,8 @@
 #include <mutex>
 
 #include <folly/File.h>
-#include <folly/Range.h>
 #include <folly/MemoryMapping.h>
+#include <folly/Range.h>
 #include <folly/io/IOBuf.h>
 
 namespace folly {

diff --git a/folly/io/async/AsyncPipe.h b/folly/io/async/AsyncPipe.h
index 7a4ece3dc537c194c1eab98a65b52e42b05bc93c..c98206e5599e7f5ab579480d723488bf5d20b5f7 100644 (file)
--- a/folly/io/async/AsyncPipe.h
+++ b/folly/io/async/AsyncPipe.h
@@ -13,16 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#pragma once
 
-#include <folly/io/async/AsyncTransport.h>
-#include <folly/io/async/EventHandler.h>
-#include <folly/io/async/DelayedDestruction.h>
-#include <folly/io/IOBufQueue.h>
+#pragma once
 
 #include <list>
 #include <system_error>
 
+#include <folly/io/IOBufQueue.h>
+#include <folly/io/async/AsyncTransport.h>
+#include <folly/io/async/DelayedDestruction.h>
+#include <folly/io/async/EventHandler.h>
+
 namespace folly {
 
 class AsyncSocketException;

diff --git a/folly/io/async/AsyncSSLSocket.h b/folly/io/async/AsyncSSLSocket.h
index 474225c060bfd66ab0bfd86e925c26037ee01ef0..33cfb62be54e7e42e79999a9bffbd4d0bc3b1ef2 100644 (file)
--- a/folly/io/async/AsyncSSLSocket.h
+++ b/folly/io/async/AsyncSSLSocket.h
@@ -18,22 +18,21 @@
 
 #include <iomanip>
 
+#include <folly/Bits.h>
 #include <folly/Optional.h>
 #include <folly/String.h>
+#include <folly/io/Cursor.h>
+#include <folly/io/IOBuf.h>
 #include <folly/io/async/AsyncSocket.h>
 #include <folly/io/async/AsyncTimeout.h>
 #include <folly/io/async/SSLContext.h>
 #include <folly/io/async/TimeoutManager.h>
-#include <folly/ssl/OpenSSLPtrTypes.h>
 #include <folly/io/async/ssl/OpenSSLUtils.h>
 #include <folly/io/async/ssl/SSLErrors.h>
 #include <folly/io/async/ssl/TLSDefinitions.h>
-
-#include <folly/Bits.h>
-#include <folly/io/IOBuf.h>
-#include <folly/io/Cursor.h>
 #include <folly/portability/OpenSSL.h>
 #include <folly/portability/Sockets.h>
+#include <folly/ssl/OpenSSLPtrTypes.h>
 
 namespace folly {
 

diff --git a/folly/io/async/AsyncSocket.h b/folly/io/async/AsyncSocket.h
index 6462f115d7a0a52e301195681f212fd65c972377..09363a3cb252421847433e2e1ecb906a4a829426 100644 (file)
--- a/folly/io/async/AsyncSocket.h
+++ b/folly/io/async/AsyncSocket.h
@@ -31,8 +31,8 @@
 #include <sys/types.h>
 
 #include <chrono>
-#include <memory>
 #include <map>
+#include <memory>
 
 namespace folly {
 

diff --git a/folly/io/async/AsyncTransport.h b/folly/io/async/AsyncTransport.h
index 7af32f2665fa44d702cbce849e3b1018770ca2a2..337fba960c71eb2624e5ea91afdf631ec91fbead 100644 (file)
--- a/folly/io/async/AsyncTransport.h
+++ b/folly/io/async/AsyncTransport.h
@@ -22,9 +22,9 @@
 #include <folly/io/async/AsyncSocketBase.h>
 #include <folly/io/async/DelayedDestruction.h>
 #include <folly/io/async/EventBase.h>
-#include <folly/ssl/OpenSSLPtrTypes.h>
 #include <folly/portability/OpenSSL.h>
 #include <folly/portability/SysUio.h>
+#include <folly/ssl/OpenSSLPtrTypes.h>
 
 constexpr bool kOpenSslModeMoveBufferOwnership =
 #ifdef SSL_MODE_MOVE_BUFFER_OWNERSHIP

diff --git a/folly/io/async/AsyncUDPServerSocket.h b/folly/io/async/AsyncUDPServerSocket.h
index 865865804f24a01195d7871af60f81c13bdb5637..f712dd0008fc0378fbf77f7f04266568b3e4e1d2 100644 (file)
--- a/folly/io/async/AsyncUDPServerSocket.h
+++ b/folly/io/async/AsyncUDPServerSocket.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <folly/io/IOBufQueue.h>
 #include <folly/Memory.h>
+#include <folly/io/IOBufQueue.h>
 #include <folly/io/async/AsyncUDPSocket.h>
 #include <folly/io/async/EventBase.h>
 

diff --git a/folly/io/async/AsyncUDPSocket.cpp b/folly/io/async/AsyncUDPSocket.cpp
index 43c79c21363e0a45998ccf3a4705b0ab3ea7231a..54ca73a2350c57ea9a7f0c5fa1815e407c4afb56 100644 (file)
--- a/folly/io/async/AsyncUDPSocket.cpp
+++ b/folly/io/async/AsyncUDPSocket.cpp
@@ -16,8 +16,8 @@
 
 #include <folly/io/async/AsyncUDPSocket.h>
 
-#include <folly/io/async/EventBase.h>
 #include <folly/Likely.h>
+#include <folly/io/async/EventBase.h>
 #include <folly/portability/Fcntl.h>
 #include <folly/portability/Sockets.h>
 #include <folly/portability/Unistd.h>

diff --git a/folly/io/async/AsyncUDPSocket.h b/folly/io/async/AsyncUDPSocket.h
index 4a5a7382af29545bf00987fd3b8344f71bcc89dc..d327c1d68787a5e4382964f23a550da03b2d39f7 100644 (file)
--- a/folly/io/async/AsyncUDPSocket.h
+++ b/folly/io/async/AsyncUDPSocket.h
@@ -16,15 +16,15 @@
 
 #pragma once
 
-#include <folly/io/IOBuf.h>
+#include <memory>
+
 #include <folly/ScopeGuard.h>
-#include <folly/io/async/AsyncSocketException.h>
+#include <folly/SocketAddress.h>
+#include <folly/io/IOBuf.h>
 #include <folly/io/async/AsyncSocketBase.h>
-#include <folly/io/async/EventHandler.h>
+#include <folly/io/async/AsyncSocketException.h>
 #include <folly/io/async/EventBase.h>
-#include <folly/SocketAddress.h>
-
-#include <memory>
+#include <folly/io/async/EventHandler.h>
 
 namespace folly {
 

diff --git a/folly/io/async/EventBase.h b/folly/io/async/EventBase.h
index 0ee54f57c812114f3c27ad2592fbe297cd28cd26..2982a6461ac0342b44b4e3604daa4548062b8263 100644 (file)
--- a/folly/io/async/EventBase.h
+++ b/folly/io/async/EventBase.h
@@ -17,11 +17,11 @@
 #pragma once
 
 #include <atomic>
+#include <cerrno>
+#include <cmath>
 #include <cstdlib>
-#include <errno.h>
 #include <functional>
 #include <list>
-#include <math.h>
 #include <memory>
 #include <mutex>
 #include <queue>
@@ -33,6 +33,7 @@
 
 #include <boost/intrusive/list.hpp>
 #include <boost/utility.hpp>
+#include <glog/logging.h>
 
 #include <folly/CallOnce.h>
 #include <folly/Executor.h>
@@ -46,7 +47,6 @@
 #include <folly/io/async/Request.h>
 #include <folly/io/async/TimeoutManager.h>
 #include <folly/portability/Event.h>
-#include <glog/logging.h>
 
 
 namespace folly {

diff --git a/folly/io/async/EventBaseManager.h b/folly/io/async/EventBaseManager.h
index 5c2ba116dd4ffc7b09c24894fb65e73e76877eea..cfcafd838923e955d8986e8c85d6b32bf0129c12 100644 (file)
--- a/folly/io/async/EventBaseManager.h
+++ b/folly/io/async/EventBaseManager.h
@@ -16,10 +16,11 @@
 
 #pragma once
 
+#include <list>
+#include <set>
+
 #include <folly/ThreadLocal.h>
 #include <folly/io/async/EventBase.h>
-#include <set>
-#include <list>
 
 namespace folly {
 

diff --git a/folly/io/async/EventFDWrapper.h b/folly/io/async/EventFDWrapper.h
index cd985f8e54e7cdc30302d3dbadf3396da3ce066c..994a718648033d1ecae6445b0b7192104915fb83 100644 (file)
--- a/folly/io/async/EventFDWrapper.h
+++ b/folly/io/async/EventFDWrapper.h
@@ -26,7 +26,7 @@
 #endif
 
 #ifdef FOLLY_HAVE_FEATURES_H
-# include <features.h>
+#include <features.h>
 #endif
 
 #if defined(__GLIBC__) && !defined(__APPLE__)
@@ -40,9 +40,9 @@
 #include <sys/eventfd.h>
 #else /* !def FOLLY_GLIBC_2_9 */
 
+#include <fcntl.h>
 #include <sys/syscall.h>
 #include <unistd.h>
-#include <fcntl.h>
 
 // Use existing __NR_eventfd2 if already defined
 // Values from the Linux kernel source:

diff --git a/folly/io/async/EventHandler.h b/folly/io/async/EventHandler.h
index 0d3e5d41e148c509706afa03fe4abc35a460ceac..80c405e5469d5d4298fbc893b04bc992548f45ff 100644 (file)
--- a/folly/io/async/EventHandler.h
+++ b/folly/io/async/EventHandler.h
@@ -16,11 +16,13 @@
 
 #pragma once
 
+#include <cstddef>
+
+#include <boost/noncopyable.hpp>
 #include <glog/logging.h>
+
 #include <folly/io/async/EventUtil.h>
 #include <folly/portability/Event.h>
-#include <boost/noncopyable.hpp>
-#include <stddef.h>
 
 namespace folly {
 

diff --git a/folly/io/async/NotificationQueue.h b/folly/io/async/NotificationQueue.h
index 076139f449e4996c07eca71d712d9eb0dbd86c06..0b3ae9e48f31bb86b2336ba4901d028bbe2a91ab 100644 (file)
--- a/folly/io/async/NotificationQueue.h
+++ b/folly/io/async/NotificationQueue.h
@@ -27,13 +27,13 @@
 
 #include <folly/Exception.h>
 #include <folly/FileUtil.h>
-#include <folly/io/async/EventBase.h>
-#include <folly/io/async/EventHandler.h>
-#include <folly/io/async/DelayedDestruction.h>
-#include <folly/io/async/Request.h>
 #include <folly/Likely.h>
 #include <folly/ScopeGuard.h>
 #include <folly/SpinLock.h>
+#include <folly/io/async/DelayedDestruction.h>
+#include <folly/io/async/EventBase.h>
+#include <folly/io/async/EventHandler.h>
+#include <folly/io/async/Request.h>
 #include <folly/portability/Fcntl.h>
 #include <folly/portability/Sockets.h>
 #include <folly/portability/Unistd.h>

diff --git a/folly/io/async/SSLContext.h b/folly/io/async/SSLContext.h
index 548a84bd104c6f3c3601e0bc253ce80797ba4d78..589fdafca35a1ccb72d264efd77c756bb4cdc34c 100644 (file)
--- a/folly/io/async/SSLContext.h
+++ b/folly/io/async/SSLContext.h
@@ -16,13 +16,13 @@
 
 #pragma once
 
-#include <mutex>
 #include <list>
 #include <map>
-#include <vector>
 #include <memory>
-#include <string>
+#include <mutex>
 #include <random>
+#include <string>
+#include <vector>
 
 #include <glog/logging.h>
 
@@ -31,9 +31,9 @@
 #endif
 
 #include <folly/Range.h>
-#include <folly/ssl/OpenSSLPtrTypes.h>
 #include <folly/io/async/ssl/OpenSSLUtils.h>
 #include <folly/portability/OpenSSL.h>
+#include <folly/ssl/OpenSSLPtrTypes.h>
 
 namespace folly {
 

diff --git a/folly/io/async/TimeoutManager.h b/folly/io/async/TimeoutManager.h
index 94128e32ac0e6d849bf7cf651cc4538d14b5c109..96af4c2c9986a7a593a25eb83a799eac11151142 100644 (file)
--- a/folly/io/async/TimeoutManager.h
+++ b/folly/io/async/TimeoutManager.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #include <chrono>
-#include <stdint.h>
+#include <cstdint>
 
 #include <folly/Function.h>
 

diff --git a/folly/io/async/ssl/OpenSSLUtils.h b/folly/io/async/ssl/OpenSSLUtils.h
index 560d5ccaeb50a161eebd99b0521b3eb24cc130d9..8914315a62f40e4ad876720e2781b8daf05eca08 100644 (file)
--- a/folly/io/async/ssl/OpenSSLUtils.h
+++ b/folly/io/async/ssl/OpenSSLUtils.h
@@ -16,9 +16,9 @@
 #pragma once
 
 #include <folly/Range.h>
-#include <folly/ssl/OpenSSLPtrTypes.h>
 #include <folly/portability/OpenSSL.h>
 #include <folly/portability/Sockets.h>
+#include <folly/ssl/OpenSSLPtrTypes.h>
 
 namespace folly {
 namespace ssl {

diff --git a/folly/io/async/test/AsyncPipeTest.cpp b/folly/io/async/test/AsyncPipeTest.cpp
index bbe172c33a0de1bd2e5661cf129499d1bd73ddb7..1259e54750c1ed61ccc17f92961f9b179f6fe6e6 100644 (file)
--- a/folly/io/async/test/AsyncPipeTest.cpp
+++ b/folly/io/async/test/AsyncPipeTest.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+#include <folly/Memory.h>
 #include <folly/io/async/AsyncPipe.h>
 #include <folly/io/async/EventBase.h>
-#include <folly/Memory.h>
 #include <folly/portability/GTest.h>
 
 #include <fcntl.h>

diff --git a/folly/io/async/test/AsyncSSLSocketTest.h b/folly/io/async/test/AsyncSSLSocketTest.h
index 816971d6dd4c369b64219883682bddf382a323b4..103b75c1d061832f943979049b54834fda6b1da3 100644 (file)
--- a/folly/io/async/test/AsyncSSLSocketTest.h
+++ b/folly/io/async/test/AsyncSSLSocketTest.h
@@ -15,8 +15,8 @@
  */
 #pragma once
 
-#include <signal.h>
 #include <pthread.h>
+#include <signal.h>
 
 #include <folly/ExceptionWrapper.h>
 #include <folly/SocketAddress.h>

diff --git a/folly/io/async/test/AsyncSocketTest.cpp b/folly/io/async/test/AsyncSocketTest.cpp
index 28a72dba3cc9b9b25f041f5a2d4180fe7a9c53c7..a9f7e46aa12eb450839b9f179bdbb38d2376f31e 100644 (file)
--- a/folly/io/async/test/AsyncSocketTest.cpp
+++ b/folly/io/async/test/AsyncSocketTest.cpp
@@ -15,8 +15,8 @@
  */
 #include <iostream>
 
-#include <folly/io/async/AsyncSocket.h>
 #include <folly/io/async/AsyncServerSocket.h>
+#include <folly/io/async/AsyncSocket.h>
 #include <folly/io/async/EventBase.h>
 #include <folly/portability/GTest.h>
 

diff --git a/folly/io/async/test/AsyncTransportTest.cpp b/folly/io/async/test/AsyncTransportTest.cpp
index 33837cd106b68c866c8b330171c6c8a8c3d92b13..ddcd4480d9c1978d82e26e998c9d3d5670ec0d78 100644 (file)
--- a/folly/io/async/test/AsyncTransportTest.cpp
+++ b/folly/io/async/test/AsyncTransportTest.cpp
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include <folly/io/async/AsyncTransport.h>
-#include <folly/io/async/AsyncSocket.h>
 
+#include <folly/io/async/AsyncSocket.h>
 #include <folly/io/async/test/MockAsyncTransport.h>
 #include <folly/portability/GTest.h>
 

diff --git a/folly/io/async/test/AsyncUDPSocketTest.cpp b/folly/io/async/test/AsyncUDPSocketTest.cpp
index ee420257df458641cc4d3e2a9ddcdc6520031c54..09ebfcc1d8cf08865fb04983fc4ed73f02a28e78 100644 (file)
--- a/folly/io/async/test/AsyncUDPSocketTest.cpp
+++ b/folly/io/async/test/AsyncUDPSocketTest.cpp
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <folly/io/async/AsyncUDPSocket.h>
-#include <folly/io/async/AsyncUDPServerSocket.h>
+#include <folly/SocketAddress.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/SocketAddress.h>
 
 #include <folly/io/IOBuf.h>
 #include <folly/portability/GTest.h>

diff --git a/folly/io/async/test/HHWheelTimerTest.cpp b/folly/io/async/test/HHWheelTimerTest.cpp
index a6c713536e176944e0e5ac5ca012c3e4955f15dd..a05bb6985ed603e301ea285a3113dec7fa78848d 100644 (file)
--- a/folly/io/async/test/HHWheelTimerTest.cpp
+++ b/folly/io/async/test/HHWheelTimerTest.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <folly/io/async/HHWheelTimer.h>
 #include <folly/io/async/EventBase.h>
+#include <folly/io/async/HHWheelTimer.h>
 #include <folly/io/async/test/UndelayedDestruction.h>
 #include <folly/io/async/test/Util.h>
 #include <folly/portability/GTest.h>

diff --git a/folly/io/async/test/NotificationQueueTest.cpp b/folly/io/async/test/NotificationQueueTest.cpp
index 614f2303b756087494122790175456faad641299..727eaad2e7dd34e9eaf77ff3de7b90a074a58638 100644 (file)
--- a/folly/io/async/test/NotificationQueueTest.cpp
+++ b/folly/io/async/test/NotificationQueueTest.cpp
@@ -15,15 +15,16 @@
  */
 
 #include <folly/io/async/NotificationQueue.h>
-#include <folly/io/async/ScopedEventBaseThread.h>
 
-#include <folly/Baton.h>
-#include <folly/portability/GTest.h>
+#include <sys/types.h>
 
-#include <list>
 #include <iostream>
+#include <list>
 #include <thread>
-#include <sys/types.h>
+
+#include <folly/Baton.h>
+#include <folly/io/async/ScopedEventBaseThread.h>
+#include <folly/portability/GTest.h>
 
 #ifndef _WIN32
 #include <sys/wait.h>

diff --git a/folly/io/async/test/UndelayedDestruction.h b/folly/io/async/test/UndelayedDestruction.h
index 055fffe27eeb192eb1ccf103919f9fd69a5c9371..f944d6062f92faf1014adc29e5d711799d0242b7 100644 (file)
--- a/folly/io/async/test/UndelayedDestruction.h
+++ b/folly/io/async/test/UndelayedDestruction.h
@@ -16,10 +16,10 @@
 
 #pragma once
 
+#include <cassert>
 #include <cstdlib>
 #include <type_traits>
 #include <utility>
-#include <cassert>
 
 namespace folly {
 

diff --git a/folly/io/async/test/Util.h b/folly/io/async/test/Util.h
index fda4a527a6c3efeb1b9e1fb7939908500476fe98..17eb1bc606adcb4c7246fcf2c8d4808c003fad1b 100644 (file)
--- a/folly/io/async/test/Util.h
+++ b/folly/io/async/test/Util.h
@@ -17,8 +17,8 @@
 #pragma once
 
 #include <folly/io/async/test/TimeUtil.h>
-#include <folly/test/TestUtils.h>
 #include <folly/portability/GTest.h>
+#include <folly/test/TestUtils.h>
 
 /**
  * Check how long a timeout took to fire.

diff --git a/folly/io/test/IOBufQueueTest.cpp b/folly/io/test/IOBufQueueTest.cpp
index a22715dace88c925c7123697e7042a1d8e8aa61a..319b5286bb6c78d3891cce1625ddbd957d20e736 100644 (file)
--- a/folly/io/test/IOBufQueueTest.cpp
+++ b/folly/io/test/IOBufQueueTest.cpp
@@ -16,9 +16,9 @@
 
 #include <folly/io/IOBufQueue.h>
 
+#include <cstring>
 #include <iostream>
 #include <stdexcept>
-#include <string.h>
 
 #include <folly/Range.h>
 #include <folly/portability/GTest.h>

diff --git a/folly/small_vector.h b/folly/small_vector.h
index f9c8067d7ff5949b1120adc6b2f9fb6d88710d13..66198ee85df330d0f616df0ba3847f0bff878388 100644 (file)
--- a/folly/small_vector.h
+++ b/folly/small_vector.h
@@ -23,25 +23,25 @@
 
 #pragma once
 
-#include <stdexcept>
-#include <cstdlib>
-#include <type_traits>
 #include <algorithm>
-#include <iterator>
 #include <cassert>
+#include <cstdlib>
+#include <iterator>
+#include <stdexcept>
+#include <type_traits>
 
-#include <boost/operators.hpp>
-#include <boost/type_traits.hpp>
-#include <boost/mpl/if.hpp>
+#include <boost/mpl/count.hpp>
+#include <boost/mpl/empty.hpp>
 #include <boost/mpl/eval_if.hpp>
-#include <boost/mpl/vector.hpp>
-#include <boost/mpl/front.hpp>
 #include <boost/mpl/filter_view.hpp>
+#include <boost/mpl/front.hpp>
 #include <boost/mpl/identity.hpp>
+#include <boost/mpl/if.hpp>
 #include <boost/mpl/placeholders.hpp>
-#include <boost/mpl/empty.hpp>
 #include <boost/mpl/size.hpp>
-#include <boost/mpl/count.hpp>
+#include <boost/mpl/vector.hpp>
+#include <boost/operators.hpp>
+#include <boost/type_traits.hpp>
 
 #include <folly/Assume.h>
 #include <folly/FormatTraits.h>

diff --git a/folly/test/AHMIntStressTest.cpp b/folly/test/AHMIntStressTest.cpp
index e119cde9c96401a264a1d736cfb7d0a313bd4c5c..a0837ca4f8ea0d8cefa483f695ff1dbbbe8c7391 100644 (file)
--- a/folly/test/AHMIntStressTest.cpp
+++ b/folly/test/AHMIntStressTest.cpp
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include <thread>
 #include <memory>
 #include <mutex>
+#include <thread>
 
 #include <folly/AtomicHashMap.h>
-#include <folly/ScopeGuard.h>
 #include <folly/Memory.h>
+#include <folly/ScopeGuard.h>
 #include <folly/portability/GTest.h>
 
 namespace {

diff --git a/folly/test/ArenaSmartPtrTest.cpp b/folly/test/ArenaSmartPtrTest.cpp
index bc216d2486c7f23e54aad6250468cc6788306291..5dddd97e9c282dce9391dafbd60ed35c2cef64fb 100644 (file)
--- a/folly/test/ArenaSmartPtrTest.cpp
+++ b/folly/test/ArenaSmartPtrTest.cpp
@@ -18,8 +18,8 @@
  * @author: Marcelo Juchem <marcelo@fb.com>
  */
 
-#include <folly/Memory.h>
 #include <folly/Arena.h>
+#include <folly/Memory.h>
 #include <folly/portability/GTest.h>
 
 using namespace folly;

diff --git a/folly/test/AtomicHashArrayTest.cpp b/folly/test/AtomicHashArrayTest.cpp
index a99d486dd387db17843192753a3e9022eaa3aba0..3e9dacb2dead2bc3413e5fa136eb676643ea4c2d 100644 (file)
--- a/folly/test/AtomicHashArrayTest.cpp
+++ b/folly/test/AtomicHashArrayTest.cpp
@@ -22,8 +22,8 @@
 #include <folly/Conv.h>
 #include <folly/Hash.h>
 #include <folly/Memory.h>
-#include <folly/portability/SysMman.h>
 #include <folly/portability/GTest.h>
+#include <folly/portability/SysMman.h>
 
 using namespace std;
 using namespace folly;

diff --git a/folly/test/AtomicHashMapTest.cpp b/folly/test/AtomicHashMapTest.cpp
index e3f3ab003e60e8f82dc81270ec5fb0a42332d3ec..ee2968db715a242081aa633ca8fab7e078592c9f 100644 (file)
--- a/folly/test/AtomicHashMapTest.cpp
+++ b/folly/test/AtomicHashMapTest.cpp
@@ -16,10 +16,11 @@
 
 #include <folly/AtomicHashMap.h>
 
-#include <glog/logging.h>
-#include <thread>
 #include <atomic>
 #include <memory>
+#include <thread>
+
+#include <glog/logging.h>
 
 #include <folly/Benchmark.h>
 #include <folly/Conv.h>

diff --git a/folly/test/BatonTest.cpp b/folly/test/BatonTest.cpp
index 74b717984686f88d8bf83b31ac50f4cb42f68bd9..ded7fb50e449cb3e87919de74d884c3014c8f537 100644 (file)
--- a/folly/test/BatonTest.cpp
+++ b/folly/test/BatonTest.cpp
@@ -15,12 +15,13 @@
  */
 
 #include <folly/Baton.h>
-#include <folly/test/BatonTestHelpers.h>
-#include <folly/test/DeterministicSchedule.h>
-#include <folly/portability/GTest.h>
 
 #include <thread>
 
+#include <folly/portability/GTest.h>
+#include <folly/test/BatonTestHelpers.h>
+#include <folly/test/DeterministicSchedule.h>
+
 using namespace folly;
 using namespace folly::test;
 using folly::detail::EmulatedFutexAtomic;

diff --git a/folly/test/BatonTestHelpers.h b/folly/test/BatonTestHelpers.h
index e4de09df7aed184ee0b4c4ab65f95af494c63f9a..7dfdc81d6365e590c64c17cbadadb098329733c8 100644 (file)
--- a/folly/test/BatonTestHelpers.h
+++ b/folly/test/BatonTestHelpers.h
@@ -17,8 +17,8 @@
 #pragma once
 
 #include <folly/Baton.h>
-#include <folly/test/DeterministicSchedule.h>
 #include <folly/portability/GTest.h>
+#include <folly/test/DeterministicSchedule.h>
 
 namespace folly {
 namespace test {

diff --git a/folly/test/BitIteratorTest.cpp b/folly/test/BitIteratorTest.cpp
index 9ddaeec5f4bfdb2643933bc3427bf7f6892ea85f..49001d86d50647eff044cf7183bca567da453294 100644 (file)
--- a/folly/test/BitIteratorTest.cpp
+++ b/folly/test/BitIteratorTest.cpp
@@ -17,8 +17,8 @@
 #include <folly/Bits.h>
 
 #include <algorithm>
-#include <type_traits>
 #include <limits>
+#include <type_traits>
 #include <vector>
 
 #include <folly/Benchmark.h>

diff --git a/folly/test/ChecksumTest.cpp b/folly/test/ChecksumTest.cpp
index 0d7bde12a20fda6bf9f6a74c4e6e124c66f20d78..b54e528e1e898f53020279766d5a1adf699af80b 100644 (file)
--- a/folly/test/ChecksumTest.cpp
+++ b/folly/test/ChecksumTest.cpp
@@ -17,6 +17,7 @@
 #include <folly/Checksum.h>
 
 #include <boost/crc.hpp>
+
 #include <folly/Benchmark.h>
 #include <folly/Hash.h>
 #include <folly/detail/ChecksumDetail.h>

diff --git a/folly/test/ClockGettimeWrappersTest.cpp b/folly/test/ClockGettimeWrappersTest.cpp
index a46ffc1c981aec177b0a0951e2a81b949cde671a..549594a6ce19504d66ae6c2109087294f03737b8 100644 (file)
--- a/folly/test/ClockGettimeWrappersTest.cpp
+++ b/folly/test/ClockGettimeWrappersTest.cpp
@@ -16,11 +16,11 @@
 
 #include <folly/ClockGettimeWrappers.h>
 
-#include <folly/test/TestUtils.h>
-#include <folly/portability/GTest.h>
-
 #include <chrono>
 
+#include <folly/portability/GTest.h>
+#include <folly/test/TestUtils.h>
+
 static constexpr auto kAcceptableDeltaSecs = std::chrono::seconds(120);
 
 using folly::test::AreWithinSecs;

diff --git a/folly/test/ConcurrentSkipListTest.cpp b/folly/test/ConcurrentSkipListTest.cpp
index 2e578e5aa9ed58429c8271ae075c9f931f20b500..87f416b7cd63474862e127d2735da2a37e9b160c 100644 (file)
--- a/folly/test/ConcurrentSkipListTest.cpp
+++ b/folly/test/ConcurrentSkipListTest.cpp
@@ -21,9 +21,9 @@
 #include <atomic>
 #include <memory>
 #include <set>
-#include <vector>
-#include <thread>
 #include <system_error>
+#include <thread>
+#include <vector>
 
 #include <glog/logging.h>
 

diff --git a/folly/test/ExceptionWrapperTest.cpp b/folly/test/ExceptionWrapperTest.cpp
index 36f7298f700663fd5e3423e3099babc98eb469d0..9d7db8655b31442bcbd728224f172fe1d4ca4b39 100644 (file)
--- a/folly/test/ExceptionWrapperTest.cpp
+++ b/folly/test/ExceptionWrapperTest.cpp
@@ -16,8 +16,8 @@
 
 #include <stdexcept>
 
-#include <folly/ExceptionWrapper.h>
 #include <folly/Conv.h>
+#include <folly/ExceptionWrapper.h>
 #include <folly/portability/GTest.h>
 
 using namespace folly;

diff --git a/folly/test/FBStringBenchmark.cpp b/folly/test/FBStringBenchmark.cpp
index f50a2894643d15473a0ac8a0b8475d80b1ed426e..342ede964f556b3d93eee2532bf2f0cd203b0241 100644 (file)
--- a/folly/test/FBStringBenchmark.cpp
+++ b/folly/test/FBStringBenchmark.cpp
@@ -20,8 +20,8 @@
 #include <folly/FBString.h>
 
 #include <cstdlib>
-#include <list>
 #include <fstream>
+#include <list>
 #include <sstream>
 
 #include <boost/random.hpp>

diff --git a/folly/test/FBStringTest.cpp b/folly/test/FBStringTest.cpp
index c2110d1f7830c1d0970cc4be10de0ef088d544d6..92f32eb362d6646c9da2cb1cd2029a663569da3a 100644 (file)
--- a/folly/test/FBStringTest.cpp
+++ b/folly/test/FBStringTest.cpp
@@ -21,17 +21,17 @@
 
 #include <atomic>
 #include <cstdlib>
-
 #include <iomanip>
 #include <list>
 #include <sstream>
+
 #include <boost/algorithm/string.hpp>
 #include <boost/random.hpp>
 
+#include <folly/Conv.h>
 #include <folly/Foreach.h>
 #include <folly/Portability.h>
 #include <folly/Random.h>
-#include <folly/Conv.h>
 #include <folly/portability/GTest.h>
 
 using namespace std;

diff --git a/folly/test/FBVectorBenchmark.cpp b/folly/test/FBVectorBenchmark.cpp
index 8884e695f78435a42543e5103a77a87c8d2ce7a6..ca327cdf0d5917b07979d110a44354e401fe03bb 100644 (file)
--- a/folly/test/FBVectorBenchmark.cpp
+++ b/folly/test/FBVectorBenchmark.cpp
@@ -17,6 +17,11 @@
 //
 // Author: andrei.alexandrescu@fb.com
 
+#include <list>
+#include <memory>
+
+#include <boost/random.hpp>
+
 #include <folly/Benchmark.h>
 #include <folly/FBString.h>
 #include <folly/FBVector.h>
@@ -26,10 +31,6 @@
 #include <folly/portability/GFlags.h>
 #include <folly/portability/GTest.h>
 
-#include <list>
-#include <memory>
-#include <boost/random.hpp>
-
 using namespace std;
 using namespace folly;
 

diff --git a/folly/test/FBVectorTest.cpp b/folly/test/FBVectorTest.cpp
index 7997da708cdf2e8a42c82f961ff1311aec8b1794..604cd05a9648b81b98a1f7621c5064ca86123f28 100644 (file)
--- a/folly/test/FBVectorTest.cpp
+++ b/folly/test/FBVectorTest.cpp
@@ -17,18 +17,20 @@
 //
 // Author: andrei.alexandrescu@fb.com
 
-#include <folly/Foreach.h>
-#include <folly/Traits.h>
-#include <folly/Random.h>
-#include <folly/FBString.h>
 #include <folly/FBVector.h>
-#include <folly/portability/GTest.h>
 
 #include <list>
 #include <map>
 #include <memory>
+
 #include <boost/random.hpp>
 
+#include <folly/FBString.h>
+#include <folly/Foreach.h>
+#include <folly/Random.h>
+#include <folly/Traits.h>
+#include <folly/portability/GTest.h>
+
 using namespace std;
 using namespace folly;
 

diff --git a/folly/test/FileLockTest.cpp b/folly/test/FileLockTest.cpp
index a72995ccf9ecf66e4081dddd98cbc958f4e187da..85e5409ccef8200e6afd3eabfc879e715b673521 100644 (file)
--- a/folly/test/FileLockTest.cpp
+++ b/folly/test/FileLockTest.cpp
@@ -18,8 +18,8 @@
 
 #include <mutex>
 
-#include <glog/logging.h>
 #include <boost/thread/locks.hpp>
+#include <glog/logging.h>
 
 #include <folly/String.h>
 #include <folly/Subprocess.h>

diff --git a/folly/test/FingerprintBenchmark.cpp b/folly/test/FingerprintBenchmark.cpp
index 5e26a673493018eec6a867b31a021d4d6f61b23f..cd02a111e5a9c1adbcd481bf006a0f3b0a567bf9 100644 (file)
--- a/folly/test/FingerprintBenchmark.cpp
+++ b/folly/test/FingerprintBenchmark.cpp
@@ -15,10 +15,11 @@
  */
 
 #include <random>
+
 #include <folly/Benchmark.h>
+#include <folly/Fingerprint.h>
 #include <folly/Format.h>
 #include <folly/detail/SlowFingerprint.h>
-#include <folly/Fingerprint.h>
 
 using namespace std;
 using namespace folly;

diff --git a/folly/test/FingerprintTest.cpp b/folly/test/FingerprintTest.cpp
index e0542498d28faaa769f67393563b144c6be2f434..e8ef9ac181fd1b3e7d5b4cda0a76b1a8dab7aadf 100644 (file)
--- a/folly/test/FingerprintTest.cpp
+++ b/folly/test/FingerprintTest.cpp
@@ -18,8 +18,8 @@
 
 #include <glog/logging.h>
 
-#include <folly/detail/SlowFingerprint.h>
 #include <folly/Benchmark.h>
+#include <folly/detail/SlowFingerprint.h>
 #include <folly/portability/GTest.h>
 
 using namespace folly;

diff --git a/folly/test/ForeachTest.cpp b/folly/test/ForeachTest.cpp
index 367c3a42e9f77fe2add900bbf0e9b26a698f43ca..6940cc7dd1e65343c6d04394865d83ecbdb5a401 100644 (file)
--- a/folly/test/ForeachTest.cpp
+++ b/folly/test/ForeachTest.cpp
@@ -16,12 +16,12 @@
 
 #include <folly/Foreach.h>
 
-#include <folly/portability/GTest.h>
-
+#include <list>
 #include <map>
 #include <string>
 #include <vector>
-#include <list>
+
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 using namespace folly::detail;

diff --git a/folly/test/FutexTest.cpp b/folly/test/FutexTest.cpp
index b64238b6274db2e8702509574f76805899b967dd..db57ef9ee6f594258bebb65f66771429a445422d 100644 (file)
--- a/folly/test/FutexTest.cpp
+++ b/folly/test/FutexTest.cpp
@@ -24,8 +24,8 @@
 
 #include <glog/logging.h>
 
-#include <folly/portability/Time.h>
 #include <folly/portability/GTest.h>
+#include <folly/portability/Time.h>
 
 using namespace folly::detail;
 using namespace folly::test;

diff --git a/folly/test/GroupVarintTest.cpp b/folly/test/GroupVarintTest.cpp
index 061e9fa7ec22f1f8d5fec40e3335aa708683bd69..b224674d78ebce8397d520281d9a89cdcb0d95f6 100644 (file)
--- a/folly/test/GroupVarintTest.cpp
+++ b/folly/test/GroupVarintTest.cpp
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-#include <stdarg.h>
-#include <algorithm>
 #include <folly/GroupVarint.h>
 
+#include <algorithm>
+#include <cstdarg>
+
 // On platforms where it's not supported, GroupVarint will be compiled out.
 #if HAVE_GROUP_VARINT
 

diff --git a/folly/test/LazyTest.cpp b/folly/test/LazyTest.cpp
index 5fe9c80860b7e8482168509620dff9d4a849850c..b11dc11ee17667881dc675a2206ca9899699e539 100644 (file)
--- a/folly/test/LazyTest.cpp
+++ b/folly/test/LazyTest.cpp
@@ -15,9 +15,9 @@
  */
 #include <folly/Lazy.h>
 
-#include <map>
 #include <functional>
 #include <iostream>
+#include <map>
 
 #include <folly/portability/GTest.h>
 

diff --git a/folly/test/MemoryTest.cpp b/folly/test/MemoryTest.cpp
index f5df99fb80563b3179eac46ef785abd3b3950d32..5ad28d5abb91ce3e32c3ce8f8d4f109cad2f678a 100644 (file)
--- a/folly/test/MemoryTest.cpp
+++ b/folly/test/MemoryTest.cpp
@@ -15,15 +15,16 @@
  */
 
 #include <folly/Memory.h>
-#include <folly/Arena.h>
-#include <folly/String.h>
-#include <folly/portability/GTest.h>
-
-#include <glog/logging.h>
 
 #include <type_traits>
 #include <utility>
 
+#include <glog/logging.h>
+
+#include <folly/Arena.h>
+#include <folly/String.h>
+#include <folly/portability/GTest.h>
+
 using namespace folly;
 
 TEST(make_unique, compatible_with_std_make_unique) {

diff --git a/folly/test/ProducerConsumerQueueBenchmark.cpp b/folly/test/ProducerConsumerQueueBenchmark.cpp
index d37ac911b8470ac754c036169947895f82cb4165..01b83d97445d0aa8dc7ac1a3e50522b69fc913cc 100644 (file)
--- a/folly/test/ProducerConsumerQueueBenchmark.cpp
+++ b/folly/test/ProducerConsumerQueueBenchmark.cpp
@@ -16,17 +16,20 @@
 
 // @author: Bert Maher <bertrand@fb.com>
 
-#include <thread>
-#include <iostream>
-#include <stdio.h>
+#include <folly/ProducerConsumerQueue.h>
+
 #include <pthread.h>
 
+#include <cstdio>
+#include <iostream>
+#include <thread>
+
+#include <glog/logging.h>
+
 #include <folly/Benchmark.h>
-#include <folly/ProducerConsumerQueue.h>
 #include <folly/portability/GFlags.h>
 #include <folly/stats/Histogram.h>
 #include <folly/stats/Histogram-defs.h>
-#include <glog/logging.h>
 
 namespace {
 

diff --git a/folly/test/RWSpinLockTest.cpp b/folly/test/RWSpinLockTest.cpp
index 1f9c9eef91cc5f98395e8c7c4fe2f0975d661191..8323d08d05ec75072ae35bf0a1afb020bec50671 100644 (file)
--- a/folly/test/RWSpinLockTest.cpp
+++ b/folly/test/RWSpinLockTest.cpp
@@ -21,8 +21,8 @@
 #include <folly/RWSpinLock.h>
 
 #include <stdlib.h>
-#include <vector>
 #include <thread>
+#include <vector>
 
 #include <glog/logging.h>
 

diff --git a/folly/test/RandomBenchmark.cpp b/folly/test/RandomBenchmark.cpp
index 287482e5f3b9c71665fd96c05d962eea16aa6bbc..60f6c5bc2e2e9cf0c511c857915f2dc4b6d62be9 100644 (file)
--- a/folly/test/RandomBenchmark.cpp
+++ b/folly/test/RandomBenchmark.cpp
@@ -16,13 +16,13 @@
 
 #include <folly/Random.h>
 
-#include <folly/Benchmark.h>
-#include <folly/Foreach.h>
+#include <random>
+#include <thread>
 
 #include <glog/logging.h>
 
-#include <thread>
-#include <random>
+#include <folly/Benchmark.h>
+#include <folly/Foreach.h>
 
 using namespace folly;
 

diff --git a/folly/test/RandomTest.cpp b/folly/test/RandomTest.cpp
index 25a2070ba0be6305561b9edfbf4eca1cc76a1f8d..30f992515d22dfa2e31c29e623ffdda17ec57b7e 100644 (file)
--- a/folly/test/RandomTest.cpp
+++ b/folly/test/RandomTest.cpp
@@ -16,13 +16,13 @@
 
 #include <folly/Random.h>
 
-#include <glog/logging.h>
-
 #include <algorithm>
-#include <thread>
-#include <vector>
 #include <random>
+#include <thread>
 #include <unordered_set>
+#include <vector>
+
+#include <glog/logging.h>
 
 #include <folly/portability/GTest.h>
 

diff --git a/folly/test/RangeFindBenchmark.cpp b/folly/test/RangeFindBenchmark.cpp
index 5ba07925d2f0f57061dd46b733d70ff93994b612..ec15a1cceff788cb4716a559a82949d781ea91da 100644 (file)
--- a/folly/test/RangeFindBenchmark.cpp
+++ b/folly/test/RangeFindBenchmark.cpp
@@ -15,13 +15,15 @@
  */
 
 #include <folly/Range.h>
-#include <folly/Benchmark.h>
-#include <folly/Foreach.h>
+
 #include <algorithm>
 #include <iostream>
 #include <random>
 #include <string>
 
+#include <folly/Benchmark.h>
+#include <folly/Foreach.h>
+
 using namespace folly;
 using namespace std;
 

diff --git a/folly/test/RangeTest.cpp b/folly/test/RangeTest.cpp
index 8a2b2762def14124b57ea0c7b927d48400d3f11d..a3898856a99fc99fe332158022646dd85e1d4f7c 100644 (file)
--- a/folly/test/RangeTest.cpp
+++ b/folly/test/RangeTest.cpp
@@ -19,10 +19,6 @@
 
 #include <folly/Range.h>
 
-#include <folly/portability/GTest.h>
-#include <folly/portability/Memory.h>
-#include <folly/portability/SysMman.h>
-
 #include <array>
 #include <iterator>
 #include <limits>
@@ -30,8 +26,13 @@
 #include <string>
 #include <type_traits>
 #include <vector>
-#include <boost/range/concepts.hpp>
+
 #include <boost/algorithm/string/trim.hpp>
+#include <boost/range/concepts.hpp>
+
+#include <folly/portability/GTest.h>
+#include <folly/portability/Memory.h>
+#include <folly/portability/SysMman.h>
 
 using namespace folly;
 using namespace folly::detail;

diff --git a/folly/test/SingletonTest.cpp b/folly/test/SingletonTest.cpp
index be95ea4dfef9a6496dee19d62f3a1a9de5bd2a60..67f88f1a711fdb1dad0ab2b2d6209b5f674d8f94 100644 (file)
--- a/folly/test/SingletonTest.cpp
+++ b/folly/test/SingletonTest.cpp
@@ -16,6 +16,9 @@
 
 #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>
@@ -27,9 +30,6 @@
 #include <folly/Subprocess.h>
 #endif
 
-#include <glog/logging.h>
-#include <boost/thread/barrier.hpp>
-
 FOLLY_GCC_DISABLE_WARNING("-Wdeprecated-declarations")
 
 using namespace folly;

diff --git a/folly/test/SingletonTestGlobal.cpp b/folly/test/SingletonTestGlobal.cpp
index 825770f9fe369f5b0c8074d791d216fd2352d99b..6a2b01e5d31a6af06bb7aec7bd4c6b38e549f975 100644 (file)
--- a/folly/test/SingletonTestGlobal.cpp
+++ b/folly/test/SingletonTestGlobal.cpp
@@ -17,10 +17,10 @@
 #include <memory>
 #include <vector>
 
-#include <folly/Singleton.h>
 #include <folly/Benchmark.h>
-#include <folly/test/SingletonTestStructs.h>
+#include <folly/Singleton.h>
 #include <folly/portability/GTest.h>
+#include <folly/test/SingletonTestStructs.h>
 
 /*
  * This test needs to be in its own file, as a standalone program.

diff --git a/folly/test/SmallLocksTest.cpp b/folly/test/SmallLocksTest.cpp
index 77f42db7d32d32d9bebf857c726e418843fb0871..1e71086f74f9bef4ed089cd74d4dc043ece3a881 100644 (file)
--- a/folly/test/SmallLocksTest.cpp
+++ b/folly/test/SmallLocksTest.cpp
@@ -16,18 +16,17 @@
 
 #include <folly/SmallLocks.h>
 
-#include <folly/Random.h>
+#include <pthread.h>
 
 #include <cassert>
+#include <condition_variable>
 #include <cstdio>
 #include <mutex>
-#include <condition_variable>
 #include <string>
-#include <vector>
-#include <pthread.h>
-
 #include <thread>
+#include <vector>
 
+#include <folly/Random.h>
 #include <folly/portability/Asm.h>
 #include <folly/portability/GTest.h>
 #include <folly/portability/Unistd.h>

diff --git a/folly/test/SpookyHashV1Test.cpp b/folly/test/SpookyHashV1Test.cpp
index 19ca545391f9c15f9301f990e01eb185853fe03e..e5b4eb12d2c917b8aaa6a97ca7294f2c2f3ba424 100644 (file)
--- a/folly/test/SpookyHashV1Test.cpp
+++ b/folly/test/SpookyHashV1Test.cpp
@@ -21,17 +21,18 @@
 #endif
 
 #include <folly/SpookyHashV1.h>
-#include <folly/portability/GTest.h>
-#include <folly/portability/Time.h>
 
 #include <cinttypes>
-#include <cstdio>
 #include <cstddef>
-#include <cstring>
+#include <cstdio>
 #include <cstdlib>
+#include <cstring>
 
 #include <glog/logging.h>
 
+#include <folly/portability/GTest.h>
+#include <folly/portability/Time.h>
+
 using namespace ::folly::hash;
 
 static bool failed = false;

diff --git a/folly/test/SpookyHashV2Test.cpp b/folly/test/SpookyHashV2Test.cpp
index 084760cdd35ad0def3fff54b45db5c647cdf4ec7..227b4fb7a26e314f6ded5ce2812f2de8e2568376 100644 (file)
--- a/folly/test/SpookyHashV2Test.cpp
+++ b/folly/test/SpookyHashV2Test.cpp
@@ -21,17 +21,18 @@
 #endif
 
 #include <folly/SpookyHashV2.h>
-#include <folly/portability/GTest.h>
-#include <folly/portability/Time.h>
 
 #include <cinttypes>
-#include <cstdio>
 #include <cstddef>
-#include <cstring>
+#include <cstdio>
 #include <cstdlib>
+#include <cstring>
 
 #include <glog/logging.h>
 
+#include <folly/portability/GTest.h>
+#include <folly/portability/Time.h>
+
 using namespace ::folly::hash;
 
 static bool failed = false;

diff --git a/folly/test/SubprocessTestParentDeathHelper.cpp b/folly/test/SubprocessTestParentDeathHelper.cpp
index 2cfe95f086f2afe36344592c9c503333a419f764..100cc81f701e9c068a80a798138d5d3b5916132c 100644 (file)
--- a/folly/test/SubprocessTestParentDeathHelper.cpp
+++ b/folly/test/SubprocessTestParentDeathHelper.cpp
@@ -22,9 +22,9 @@
 // will verify that the file actually gets created, which means that everything
 // worked as intended.
 
-#include <sys/types.h>
 #include <fcntl.h>
 #include <signal.h>
+#include <sys/types.h>
 
 #include <glog/logging.h>
 

diff --git a/folly/test/SynchronizedTest.cpp b/folly/test/SynchronizedTest.cpp
index c95d0f14b35c47c04fe8ac338db6287bba1cb92e..db0f9c93ce6509a8736008d9008b24263223f9e8 100644 (file)
--- a/folly/test/SynchronizedTest.cpp
+++ b/folly/test/SynchronizedTest.cpp
@@ -24,8 +24,8 @@
 #include <folly/SharedMutex.h>
 #include <folly/SpinLock.h>
 #include <folly/Synchronized.h>
-#include <folly/test/SynchronizedTestLib.h>
 #include <folly/portability/GTest.h>
+#include <folly/test/SynchronizedTestLib.h>
 
 using namespace folly::sync_tests;
 

diff --git a/folly/test/ThreadCachedArenaTest.cpp b/folly/test/ThreadCachedArenaTest.cpp
index e835ae994e7f0bf1acde03d56bf3b155f9af480e..458239db9aff799fb0ff5579182534a1edf8b8e1 100644 (file)
--- a/folly/test/ThreadCachedArenaTest.cpp
+++ b/folly/test/ThreadCachedArenaTest.cpp
@@ -15,20 +15,20 @@
  */
 
 #include <folly/ThreadCachedArena.h>
-#include <folly/Memory.h>
 
+#include <algorithm>
+#include <iterator>
 #include <map>
 #include <mutex>
-#include <thread>
-#include <iterator>
-#include <algorithm>
 #include <random>
+#include <thread>
 #include <unordered_map>
 
 #include <glog/logging.h>
 
-#include <folly/Range.h>
 #include <folly/Benchmark.h>
+#include <folly/Memory.h>
+#include <folly/Range.h>
 #include <folly/portability/GTest.h>
 
 using namespace folly;

diff --git a/folly/test/ThreadLocalTest.cpp b/folly/test/ThreadLocalTest.cpp
index 62526ebc8a8165e14fd34166d76ed0a3149f4afb..2aeb205418cdc97ce9182baa2793355d77fc445f 100644 (file)
--- a/folly/test/ThreadLocalTest.cpp
+++ b/folly/test/ThreadLocalTest.cpp
@@ -26,8 +26,8 @@
 #include <array>
 #include <atomic>
 #include <chrono>
+#include <climits>
 #include <condition_variable>
-#include <limits.h>
 #include <map>
 #include <mutex>
 #include <set>

diff --git a/folly/test/stl_tests/StlVectorTest.cpp b/folly/test/stl_tests/StlVectorTest.cpp
index 6ca2a7fc509c335c2504bf0a60a39cfcd4432cb6..f82d741af2422c0fb575bcb8b1b3557fc953087c 100644 (file)
--- a/folly/test/stl_tests/StlVectorTest.cpp
+++ b/folly/test/stl_tests/StlVectorTest.cpp
@@ -168,18 +168,18 @@ THOUGHTS:
 
 //#define USING_STD_VECTOR
 
+#include <climits>
+#include <cstddef>
+#include <exception>
+#include <iomanip>
 #include <iostream>
-#include <sstream>
-#include <typeinfo>
-#include <type_traits>
 #include <map>
 #include <set>
-#include <string>
+#include <sstream>
 #include <stdexcept>
-#include <exception>
-#include <climits>
-#include <cstddef>
-#include <iomanip>
+#include <string>
+#include <type_traits>
+#include <typeinfo>
 
 #include <boost/iterator/iterator_adaptor.hpp>
 #include <boost/preprocessor.hpp>