From 6a6ac91e1fda65d7871390f03be8d19b3591ba45 Mon Sep 17 00:00:00 2001 From: Christopher Dykes Date: Fri, 9 Sep 2016 17:44:01 -0700 Subject: [PATCH] Use the GTest portability headers Summary: Switch all of the uses of `` to ``. This is painful but necessary to get the tests to compile nicely under MSVC. Reviewed By: yfeldblum Differential Revision: D3837300 fbshipit-source-id: 7ae43a5d5ba94c8c24fa23a485f18546416e7191 --- folly/experimental/bser/test/BserTest.cpp | 2 +- .../exception_tracer/test/ExceptionCounterTest.cpp | 3 +-- folly/experimental/io/test/AsyncIOTest.cpp | 2 +- folly/experimental/io/test/FsUtilTest.cpp | 3 ++- folly/experimental/observer/test/ObserverTest.cpp | 2 +- folly/experimental/symbolizer/test/DwarfTests.cpp | 2 +- folly/experimental/symbolizer/test/ElfTests.cpp | 3 +-- folly/experimental/symbolizer/test/LineReaderTest.cpp | 2 +- folly/experimental/symbolizer/test/SignalHandlerTest.cpp | 3 +-- folly/experimental/symbolizer/test/StackTraceTest.cpp | 3 ++- folly/experimental/symbolizer/test/SymbolizerTest.cpp | 3 +-- folly/experimental/test/AutoTimerTest.cpp | 3 ++- folly/experimental/test/BitsTest.cpp | 3 ++- folly/experimental/test/CodingTestUtils.h | 3 ++- folly/experimental/test/DynamicParserTest.cpp | 2 +- folly/experimental/test/EventCountTest.cpp | 2 +- folly/experimental/test/FunctionSchedulerTest.cpp | 3 ++- folly/experimental/test/FutureDAGTest.cpp | 2 +- folly/experimental/test/JSONSchemaTest.cpp | 2 +- folly/experimental/test/LockFreeRingBufferTest.cpp | 2 +- folly/experimental/test/NestedCommandLineAppTest.cpp | 2 +- folly/experimental/test/ProgramOptionsTest.cpp | 2 +- folly/experimental/test/ReadMostlySharedPtrTest.cpp | 2 +- folly/experimental/test/RefCountTest.cpp | 3 +-- folly/experimental/test/StringKeyedTest.cpp | 2 +- folly/experimental/test/TestUtilTest.cpp | 2 +- folly/experimental/test/TupleOpsTest.cpp | 3 ++- folly/fibers/test/FibersTest.cpp | 3 +-- folly/futures/test/BarrierTest.cpp | 3 ++- folly/futures/test/CollectTest.cpp | 3 +-- folly/futures/test/ContextTest.cpp | 3 +-- folly/futures/test/ConversionTest.cpp | 4 ++-- folly/futures/test/CoreTest.cpp | 3 +-- folly/futures/test/EnsureTest.cpp | 3 +-- folly/futures/test/ExecutorTest.cpp | 3 +-- folly/futures/test/FSMTest.cpp | 3 +-- folly/futures/test/FilterTest.cpp | 3 +-- folly/futures/test/FutureTest.cpp | 3 +-- folly/futures/test/HeaderCompileTest.cpp | 3 +-- folly/futures/test/InterruptTest.cpp | 3 +-- folly/futures/test/MapTest.cpp | 3 +-- folly/futures/test/NonCopyableLambdaTest.cpp | 3 +-- folly/futures/test/PollTest.cpp | 3 +-- folly/futures/test/PromiseTest.cpp | 3 +-- folly/futures/test/ReduceTest.cpp | 3 +-- folly/futures/test/RetryingTest.cpp | 3 ++- folly/futures/test/SelfDestructTest.cpp | 3 +-- folly/futures/test/SharedPromiseTest.cpp | 3 +-- folly/futures/test/ThenCompileTest.h | 3 +-- folly/futures/test/ThenTest.cpp | 3 +-- folly/futures/test/TimekeeperTest.cpp | 3 +-- folly/futures/test/TimesTest.cpp | 2 +- folly/futures/test/UnwrapTest.cpp | 3 +-- folly/futures/test/ViaTest.cpp | 3 +-- folly/futures/test/WaitTest.cpp | 3 +-- folly/futures/test/WhenTest.cpp | 2 +- folly/futures/test/WhileDoTest.cpp | 2 +- folly/futures/test/WillEqualTest.cpp | 3 +-- folly/futures/test/WindowTest.cpp | 3 +-- folly/gen/test/BaseTest.cpp | 3 ++- folly/gen/test/CombineTest.cpp | 2 +- folly/gen/test/FileTest.cpp | 2 +- folly/gen/test/ParallelMapTest.cpp | 2 +- folly/gen/test/ParallelTest.cpp | 4 +++- folly/gen/test/StringTest.cpp | 3 ++- folly/io/async/ssl/test/SSLErrorsTest.cpp | 3 ++- folly/io/async/test/AsyncPipeTest.cpp | 2 +- folly/io/async/test/AsyncSSLSocketTest.cpp | 2 +- folly/io/async/test/AsyncSSLSocketTest.h | 2 +- folly/io/async/test/AsyncSSLSocketTest2.cpp | 2 +- folly/io/async/test/AsyncSSLSocketWriteTest.cpp | 2 +- folly/io/async/test/AsyncSocketExceptionTest.cpp | 3 ++- folly/io/async/test/AsyncSocketTest.cpp | 3 +-- folly/io/async/test/AsyncSocketTest2.cpp | 2 +- folly/io/async/test/AsyncTimeoutTest.cpp | 3 +-- folly/io/async/test/AsyncTransportTest.cpp | 3 +-- folly/io/async/test/AsyncUDPSocketTest.cpp | 3 +-- folly/io/async/test/DelayedDestructionBaseTest.cpp | 3 ++- folly/io/async/test/DelayedDestructionTest.cpp | 2 +- folly/io/async/test/EventBaseLocalTest.cpp | 2 +- folly/io/async/test/EventHandlerTest.cpp | 2 +- folly/io/async/test/HHWheelTimerSlowTests.cpp | 2 +- folly/io/async/test/HHWheelTimerTest.cpp | 2 +- folly/io/async/test/NotificationQueueTest.cpp | 4 ++-- folly/io/async/test/RequestContextTest.cpp | 2 +- folly/io/async/test/ScopedEventBaseThreadTest.cpp | 3 +-- folly/io/async/test/Util.h | 2 +- folly/io/async/test/WriteChainAsyncTransportWrapperTest.cpp | 2 +- folly/io/test/CompressionTest.cpp | 2 +- folly/io/test/IOBufCursorTest.cpp | 3 +-- folly/io/test/IOBufQueueTest.cpp | 3 +-- folly/io/test/IOBufTest.cpp | 2 +- folly/io/test/RecordIOTest.cpp | 2 +- folly/io/test/ShutdownSocketSetTest.cpp | 2 +- folly/portability/test/ConstexprTest.cpp | 2 +- folly/portability/test/LibgenTest.cpp | 3 +-- folly/portability/test/TimeTest.cpp | 3 +-- folly/ssl/test/OpenSSLHashTest.cpp | 3 +-- folly/test/AHMIntStressTest.cpp | 3 +-- folly/test/ApplyTupleTest.cpp | 2 +- folly/test/ArenaSmartPtrTest.cpp | 3 +-- folly/test/ArenaTest.cpp | 2 +- folly/test/ArrayTest.cpp | 2 +- folly/test/AsciiCaseInsensitiveTest.cpp | 2 +- folly/test/AtomicBitSetTest.cpp | 3 ++- folly/test/AtomicHashArrayTest.cpp | 2 +- folly/test/AtomicHashMapTest.cpp | 2 +- folly/test/AtomicLinkedListTest.cpp | 3 +-- folly/test/AtomicStructTest.cpp | 2 +- folly/test/AtomicUnorderedMapTest.cpp | 3 +-- folly/test/BatonBenchmark.cpp | 3 +-- folly/test/BatonTest.cpp | 3 ++- folly/test/BatonTestHelpers.h | 3 +-- folly/test/BitIteratorTest.cpp | 3 +-- folly/test/BitsTest.cpp | 2 +- folly/test/CacheLocalityTest.cpp | 3 ++- folly/test/CachelinePaddedTest.cpp | 2 +- folly/test/CallOnceTest.cpp | 2 +- folly/test/ChecksumTest.cpp | 2 +- folly/test/ClockGettimeWrappersTest.cpp | 3 +-- folly/test/ConcurrentSkipListTest.cpp | 2 +- folly/test/ContainerTraitsTest.cpp | 2 +- folly/test/ConvTest.cpp | 4 +++- folly/test/CpuIdTest.cpp | 2 +- folly/test/DemangleTest.cpp | 2 +- folly/test/DeterministicScheduleTest.cpp | 3 +-- folly/test/DiscriminatedPtrTest.cpp | 2 +- folly/test/DynamicConverterTest.cpp | 3 ++- folly/test/DynamicOtherTest.cpp | 3 +-- folly/test/DynamicTest.cpp | 3 ++- folly/test/EndianTest.cpp | 2 +- folly/test/EnumerateTest.cpp | 2 +- folly/test/EvictingCacheMapTest.cpp | 3 +-- folly/test/ExceptionTest.cpp | 2 +- folly/test/ExceptionWrapperTest.cpp | 3 ++- folly/test/ExpectedTest.cpp | 2 +- folly/test/FBStringTest.cpp | 2 +- folly/test/FBVectorBenchmark.cpp | 2 +- folly/test/FBVectorTest.cpp | 2 +- folly/test/FileLockTest.cpp | 2 +- folly/test/FileTest.cpp | 3 +-- folly/test/FileUtilTest.cpp | 2 +- folly/test/FingerprintTest.cpp | 2 +- folly/test/ForeachBenchmark.cpp | 2 +- folly/test/ForeachTest.cpp | 3 ++- folly/test/FormatOtherTest.cpp | 2 +- folly/test/FormatTest.cpp | 2 +- folly/test/FunctionSchedulerTest.cpp | 2 +- folly/test/FunctionTest.cpp | 2 +- folly/test/FutexTest.cpp | 2 +- folly/test/GroupVarintTest.cpp | 2 +- folly/test/HasMemberFnTraitsTest.cpp | 3 ++- folly/test/HashTest.cpp | 2 +- folly/test/HistogramTest.cpp | 2 +- folly/test/IPAddressTest.cpp | 3 +-- folly/test/IPAddressTest.h | 3 +-- folly/test/IndestructibleTest.cpp | 3 ++- folly/test/IndexedMemPoolTest.cpp | 3 ++- folly/test/JsonOtherTest.cpp | 3 +-- folly/test/JsonTest.cpp | 3 ++- folly/test/LazyTest.cpp | 2 +- folly/test/LifoSemTests.cpp | 3 +-- folly/test/LockTraitsTest.cpp | 2 +- folly/test/LoggingTest.cpp | 2 +- folly/test/MPMCPipelineTest.cpp | 2 +- folly/test/MPMCQueueTest.cpp | 3 +-- folly/test/MacAddressTest.cpp | 3 +-- folly/test/MallctlHelperTest.cpp | 2 +- folly/test/MapUtilTest.cpp | 3 ++- folly/test/MathTest.cpp | 2 +- folly/test/MemcpyTest.cpp | 2 +- folly/test/MemoryIdlerTest.cpp | 3 +-- folly/test/MemoryMappingTest.cpp | 3 +-- folly/test/MemoryTest.cpp | 2 +- folly/test/MergeTest.cpp | 4 +++- folly/test/MoveWrapperTest.cpp | 5 +++-- folly/test/OptionalTest.cpp | 2 +- folly/test/PackedSyncPtrTest.cpp | 3 ++- folly/test/PaddedTest.cpp | 3 ++- folly/test/PartialTest.cpp | 3 ++- folly/test/PortabilityTest.cpp | 2 +- folly/test/ProducerConsumerQueueTest.cpp | 3 ++- folly/test/RWSpinLockTest.cpp | 2 +- folly/test/RandomTest.cpp | 3 ++- folly/test/RangeTest.cpp | 2 +- folly/test/SafeAssertTest.cpp | 2 +- folly/test/ScopeGuardTest.cpp | 3 ++- folly/test/SharedMutexTest.cpp | 2 +- folly/test/SingletonTest.cpp | 2 +- folly/test/SingletonTestGlobal.cpp | 2 +- folly/test/SingletonTestStructs.h | 3 ++- folly/test/SingletonVaultCTest.cpp | 4 ++-- folly/test/SmallLocksTest.cpp | 3 +-- folly/test/SocketAddressTest.cpp | 2 +- folly/test/SparseByteSetTest.cpp | 2 +- folly/test/SpinLockTest.cpp | 2 +- folly/test/SpookyHashV1Test.cpp | 3 +-- folly/test/SpookyHashV2Test.cpp | 3 +-- folly/test/StringTest.cpp | 2 +- folly/test/SubprocessTest.cpp | 2 +- folly/test/SynchronizedTest.cpp | 2 +- folly/test/SynchronizedTestLib-inl.h | 3 +-- folly/test/TestUtils.h | 2 +- folly/test/ThreadCachedArenaTest.cpp | 2 +- folly/test/ThreadCachedIntTest.cpp | 2 +- folly/test/ThreadLocalTest.cpp | 2 +- folly/test/ThreadNameTest.cpp | 2 +- folly/test/TimeoutQueueTest.cpp | 3 ++- folly/test/TimeseriesHistogramTest.cpp | 2 +- folly/test/TimeseriesTest.cpp | 2 +- folly/test/TokenBucketTest.cpp | 2 +- folly/test/TokenBucketTest.h | 3 +-- folly/test/TraitsTest.cpp | 2 +- folly/test/TryTest.cpp | 3 +-- folly/test/UnitTest.cpp | 4 ++-- folly/test/UriTest.cpp | 2 +- folly/test/VarintTest.cpp | 2 +- folly/test/common/TestMain.cpp | 2 +- folly/test/small_vector_test.cpp | 2 +- folly/test/sorted_vector_test.cpp | 4 +++- folly/test/stl_tests/StlVectorTest.cpp | 2 +- 221 files changed, 269 insertions(+), 293 deletions(-) diff --git a/folly/experimental/bser/test/BserTest.cpp b/folly/experimental/bser/test/BserTest.cpp index e2672cbe..8534d536 100644 --- a/folly/experimental/bser/test/BserTest.cpp +++ b/folly/experimental/bser/test/BserTest.cpp @@ -15,7 +15,7 @@ */ #include #include -#include +#include using folly::dynamic; diff --git a/folly/experimental/exception_tracer/test/ExceptionCounterTest.cpp b/folly/experimental/exception_tracer/test/ExceptionCounterTest.cpp index 37d63921..24b413e9 100644 --- a/folly/experimental/exception_tracer/test/ExceptionCounterTest.cpp +++ b/folly/experimental/exception_tracer/test/ExceptionCounterTest.cpp @@ -21,9 +21,8 @@ #include #include -#include - #include +#include struct MyException {}; diff --git a/folly/experimental/io/test/AsyncIOTest.cpp b/folly/experimental/io/test/AsyncIOTest.cpp index eae19c1d..f7272d47 100644 --- a/folly/experimental/io/test/AsyncIOTest.cpp +++ b/folly/experimental/io/test/AsyncIOTest.cpp @@ -28,11 +28,11 @@ #include #include -#include #include #include #include +#include #include namespace fs = folly::fs; diff --git a/folly/experimental/io/test/FsUtilTest.cpp b/folly/experimental/io/test/FsUtilTest.cpp index 22789873..fd23b90d 100644 --- a/folly/experimental/io/test/FsUtilTest.cpp +++ b/folly/experimental/io/test/FsUtilTest.cpp @@ -17,7 +17,8 @@ #include #include -#include + +#include using namespace folly; using namespace folly::fs; diff --git a/folly/experimental/observer/test/ObserverTest.cpp b/folly/experimental/observer/test/ObserverTest.cpp index 6ace4203..c2be17b9 100644 --- a/folly/experimental/observer/test/ObserverTest.cpp +++ b/folly/experimental/observer/test/ObserverTest.cpp @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include #include #include #include +#include using namespace folly::observer; diff --git a/folly/experimental/symbolizer/test/DwarfTests.cpp b/folly/experimental/symbolizer/test/DwarfTests.cpp index 676bedd0..00834ee5 100644 --- a/folly/experimental/symbolizer/test/DwarfTests.cpp +++ b/folly/experimental/symbolizer/test/DwarfTests.cpp @@ -16,7 +16,7 @@ #include -#include +#include using folly::symbolizer::Dwarf; diff --git a/folly/experimental/symbolizer/test/ElfTests.cpp b/folly/experimental/symbolizer/test/ElfTests.cpp index 84d526c5..32ef4e07 100644 --- a/folly/experimental/symbolizer/test/ElfTests.cpp +++ b/folly/experimental/symbolizer/test/ElfTests.cpp @@ -14,9 +14,8 @@ * limitations under the License. */ -#include - #include +#include using folly::symbolizer::ElfFile; diff --git a/folly/experimental/symbolizer/test/LineReaderTest.cpp b/folly/experimental/symbolizer/test/LineReaderTest.cpp index 61a748b5..3e825722 100644 --- a/folly/experimental/symbolizer/test/LineReaderTest.cpp +++ b/folly/experimental/symbolizer/test/LineReaderTest.cpp @@ -17,10 +17,10 @@ #include #include -#include #include #include +#include namespace folly { namespace symbolizer { namespace test { diff --git a/folly/experimental/symbolizer/test/SignalHandlerTest.cpp b/folly/experimental/symbolizer/test/SignalHandlerTest.cpp index 77b642ca..fa0e4721 100644 --- a/folly/experimental/symbolizer/test/SignalHandlerTest.cpp +++ b/folly/experimental/symbolizer/test/SignalHandlerTest.cpp @@ -17,11 +17,10 @@ #include #include -#include - #include #include #include +#include namespace folly { namespace symbolizer { namespace test { diff --git a/folly/experimental/symbolizer/test/StackTraceTest.cpp b/folly/experimental/symbolizer/test/StackTraceTest.cpp index 9a58c61b..c4fe7f75 100644 --- a/folly/experimental/symbolizer/test/StackTraceTest.cpp +++ b/folly/experimental/symbolizer/test/StackTraceTest.cpp @@ -18,7 +18,8 @@ #include #include -#include + +#include using namespace folly; using namespace folly::symbolizer; diff --git a/folly/experimental/symbolizer/test/SymbolizerTest.cpp b/folly/experimental/symbolizer/test/SymbolizerTest.cpp index efcb4047..66435cbc 100644 --- a/folly/experimental/symbolizer/test/SymbolizerTest.cpp +++ b/folly/experimental/symbolizer/test/SymbolizerTest.cpp @@ -18,10 +18,9 @@ #include -#include - #include #include +#include namespace folly { namespace symbolizer { namespace test { diff --git a/folly/experimental/test/AutoTimerTest.cpp b/folly/experimental/test/AutoTimerTest.cpp index de8e3134..f4c71c51 100644 --- a/folly/experimental/test/AutoTimerTest.cpp +++ b/folly/experimental/test/AutoTimerTest.cpp @@ -14,9 +14,10 @@ * limitations under the License. */ -#include #include +#include + using namespace folly; using namespace std; diff --git a/folly/experimental/test/BitsTest.cpp b/folly/experimental/test/BitsTest.cpp index b09a768f..58a5a5a7 100644 --- a/folly/experimental/test/BitsTest.cpp +++ b/folly/experimental/test/BitsTest.cpp @@ -17,7 +17,8 @@ #include #include -#include + +#include using namespace folly; diff --git a/folly/experimental/test/CodingTestUtils.h b/folly/experimental/test/CodingTestUtils.h index d16f31e7..7789df14 100644 --- a/folly/experimental/test/CodingTestUtils.h +++ b/folly/experimental/test/CodingTestUtils.h @@ -24,7 +24,8 @@ #include #include #include -#include + +#include namespace folly { namespace compression { diff --git a/folly/experimental/test/DynamicParserTest.cpp b/folly/experimental/test/DynamicParserTest.cpp index 39bc5752..38db3030 100644 --- a/folly/experimental/test/DynamicParserTest.cpp +++ b/folly/experimental/test/DynamicParserTest.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include using namespace folly; using dynamic = folly::dynamic; diff --git a/folly/experimental/test/EventCountTest.cpp b/folly/experimental/test/EventCountTest.cpp index b5257608..e01fa1f1 100644 --- a/folly/experimental/test/EventCountTest.cpp +++ b/folly/experimental/test/EventCountTest.cpp @@ -22,9 +22,9 @@ #include #include #include -#include #include +#include using namespace folly; diff --git a/folly/experimental/test/FunctionSchedulerTest.cpp b/folly/experimental/test/FunctionSchedulerTest.cpp index 8e0ea8e1..e54d1b4a 100644 --- a/folly/experimental/test/FunctionSchedulerTest.cpp +++ b/folly/experimental/test/FunctionSchedulerTest.cpp @@ -20,7 +20,8 @@ #include #include #include -#include + +#include using namespace folly; using std::chrono::milliseconds; diff --git a/folly/experimental/test/FutureDAGTest.cpp b/folly/experimental/test/FutureDAGTest.cpp index 1fb947aa..c15a8a21 100644 --- a/folly/experimental/test/FutureDAGTest.cpp +++ b/folly/experimental/test/FutureDAGTest.cpp @@ -15,7 +15,7 @@ */ #include #include -#include +#include using namespace folly; diff --git a/folly/experimental/test/JSONSchemaTest.cpp b/folly/experimental/test/JSONSchemaTest.cpp index 84f3fa92..04a7a095 100644 --- a/folly/experimental/test/JSONSchemaTest.cpp +++ b/folly/experimental/test/JSONSchemaTest.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include using folly::dynamic; using folly::parseJson; diff --git a/folly/experimental/test/LockFreeRingBufferTest.cpp b/folly/experimental/test/LockFreeRingBufferTest.cpp index 14b373d2..edd666b5 100644 --- a/folly/experimental/test/LockFreeRingBufferTest.cpp +++ b/folly/experimental/test/LockFreeRingBufferTest.cpp @@ -14,13 +14,13 @@ * limitations under the License. */ -#include #include #include #include #include #include +#include namespace folly { diff --git a/folly/experimental/test/NestedCommandLineAppTest.cpp b/folly/experimental/test/NestedCommandLineAppTest.cpp index b52ab804..d4b749c0 100644 --- a/folly/experimental/test/NestedCommandLineAppTest.cpp +++ b/folly/experimental/test/NestedCommandLineAppTest.cpp @@ -18,8 +18,8 @@ #include #include +#include #include -#include namespace folly { namespace test { diff --git a/folly/experimental/test/ProgramOptionsTest.cpp b/folly/experimental/test/ProgramOptionsTest.cpp index 9dd175c1..c54dd54b 100644 --- a/folly/experimental/test/ProgramOptionsTest.cpp +++ b/folly/experimental/test/ProgramOptionsTest.cpp @@ -19,8 +19,8 @@ #include #include #include +#include #include -#include namespace folly { namespace test { diff --git a/folly/experimental/test/ReadMostlySharedPtrTest.cpp b/folly/experimental/test/ReadMostlySharedPtrTest.cpp index 4f683586..ffbe0d45 100644 --- a/folly/experimental/test/ReadMostlySharedPtrTest.cpp +++ b/folly/experimental/test/ReadMostlySharedPtrTest.cpp @@ -20,11 +20,11 @@ #include #include #include -#include #include #include #include +#include using folly::ReadMostlyMainPtr; using folly::ReadMostlyWeakPtr; diff --git a/folly/experimental/test/RefCountTest.cpp b/folly/experimental/test/RefCountTest.cpp index a9b08143..440f25ea 100644 --- a/folly/experimental/test/RefCountTest.cpp +++ b/folly/experimental/test/RefCountTest.cpp @@ -18,8 +18,7 @@ #include #include #include - -#include +#include namespace folly { diff --git a/folly/experimental/test/StringKeyedTest.cpp b/folly/experimental/test/StringKeyedTest.cpp index dd05d0a3..446e74a3 100644 --- a/folly/experimental/test/StringKeyedTest.cpp +++ b/folly/experimental/test/StringKeyedTest.cpp @@ -24,10 +24,10 @@ #include #include -#include #include #include +#include using folly::StringKeyedMap; using folly::StringKeyedSetBase; diff --git a/folly/experimental/test/TestUtilTest.cpp b/folly/experimental/test/TestUtilTest.cpp index 3110f6fa..79046e07 100644 --- a/folly/experimental/test/TestUtilTest.cpp +++ b/folly/experimental/test/TestUtilTest.cpp @@ -23,11 +23,11 @@ #include #include -#include #include #include #include +#include using namespace folly; using namespace folly::test; diff --git a/folly/experimental/test/TupleOpsTest.cpp b/folly/experimental/test/TupleOpsTest.cpp index 24df7b21..80071eaa 100644 --- a/folly/experimental/test/TupleOpsTest.cpp +++ b/folly/experimental/test/TupleOpsTest.cpp @@ -17,8 +17,9 @@ #include #include +#include + #include -#include namespace folly { namespace test { diff --git a/folly/fibers/test/FibersTest.cpp b/folly/fibers/test/FibersTest.cpp index bbb5ddcf..2a05fd4b 100644 --- a/folly/fibers/test/FibersTest.cpp +++ b/folly/fibers/test/FibersTest.cpp @@ -17,8 +17,6 @@ #include #include -#include - #include #include @@ -30,6 +28,7 @@ #include #include #include +#include using namespace folly::fibers; diff --git a/folly/futures/test/BarrierTest.cpp b/folly/futures/test/BarrierTest.cpp index 47a3e3d9..8e4f7896 100644 --- a/folly/futures/test/BarrierTest.cpp +++ b/folly/futures/test/BarrierTest.cpp @@ -21,8 +21,9 @@ #include #include +#include + #include -#include namespace folly { namespace futures { namespace test { diff --git a/folly/futures/test/CollectTest.cpp b/folly/futures/test/CollectTest.cpp index 673161aa..f7cb1b92 100644 --- a/folly/futures/test/CollectTest.cpp +++ b/folly/futures/test/CollectTest.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#include - #include #include @@ -23,6 +21,7 @@ #include #include #include +#include using namespace folly; diff --git a/folly/futures/test/ContextTest.cpp b/folly/futures/test/ContextTest.cpp index e5946b26..0451a80d 100644 --- a/folly/futures/test/ContextTest.cpp +++ b/folly/futures/test/ContextTest.cpp @@ -14,9 +14,8 @@ * limitations under the License. */ -#include - #include +#include using namespace folly; diff --git a/folly/futures/test/ConversionTest.cpp b/folly/futures/test/ConversionTest.cpp index 53b15b1b..e300c4e8 100644 --- a/folly/futures/test/ConversionTest.cpp +++ b/folly/futures/test/ConversionTest.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include - #include +#include + #include using namespace folly; diff --git a/folly/futures/test/CoreTest.cpp b/folly/futures/test/CoreTest.cpp index c65a76d0..7d2dc1b3 100644 --- a/folly/futures/test/CoreTest.cpp +++ b/folly/futures/test/CoreTest.cpp @@ -14,10 +14,9 @@ * limitations under the License. */ -#include - #include #include +#include using namespace folly; diff --git a/folly/futures/test/EnsureTest.cpp b/folly/futures/test/EnsureTest.cpp index 62122027..925f96f4 100644 --- a/folly/futures/test/EnsureTest.cpp +++ b/folly/futures/test/EnsureTest.cpp @@ -17,9 +17,8 @@ #include #include -#include - #include +#include using namespace folly; diff --git a/folly/futures/test/ExecutorTest.cpp b/folly/futures/test/ExecutorTest.cpp index b11a8a6c..9730ef43 100644 --- a/folly/futures/test/ExecutorTest.cpp +++ b/folly/futures/test/ExecutorTest.cpp @@ -14,13 +14,12 @@ * limitations under the License. */ -#include - #include #include #include #include #include +#include using namespace folly; diff --git a/folly/futures/test/FSMTest.cpp b/folly/futures/test/FSMTest.cpp index 1dd4f6bb..6f315dd0 100644 --- a/folly/futures/test/FSMTest.cpp +++ b/folly/futures/test/FSMTest.cpp @@ -14,9 +14,8 @@ * limitations under the License. */ -#include - #include +#include using namespace folly::detail; diff --git a/folly/futures/test/FilterTest.cpp b/folly/futures/test/FilterTest.cpp index 9159587d..a8baf565 100644 --- a/folly/futures/test/FilterTest.cpp +++ b/folly/futures/test/FilterTest.cpp @@ -14,9 +14,8 @@ * limitations under the License. */ -#include - #include +#include using namespace folly; diff --git a/folly/futures/test/FutureTest.cpp b/folly/futures/test/FutureTest.cpp index a025dba9..8a66184a 100644 --- a/folly/futures/test/FutureTest.cpp +++ b/folly/futures/test/FutureTest.cpp @@ -14,14 +14,13 @@ * limitations under the License. */ -#include - #include #include #include #include #include #include +#include #include #include diff --git a/folly/futures/test/HeaderCompileTest.cpp b/folly/futures/test/HeaderCompileTest.cpp index ae2e5ded..f2fe8364 100644 --- a/folly/futures/test/HeaderCompileTest.cpp +++ b/folly/futures/test/HeaderCompileTest.cpp @@ -14,13 +14,12 @@ * limitations under the License. */ -#include - // amazing what things can go wrong if you include things in an unexpected // order. #include #include #include +#include TEST(Basic, compiles) { EXPECT_TRUE(true); diff --git a/folly/futures/test/InterruptTest.cpp b/folly/futures/test/InterruptTest.cpp index 16a8e082..5c599b0a 100644 --- a/folly/futures/test/InterruptTest.cpp +++ b/folly/futures/test/InterruptTest.cpp @@ -14,11 +14,10 @@ * limitations under the License. */ -#include - #include #include #include +#include using namespace folly; diff --git a/folly/futures/test/MapTest.cpp b/folly/futures/test/MapTest.cpp index 743a082a..e972deda 100644 --- a/folly/futures/test/MapTest.cpp +++ b/folly/futures/test/MapTest.cpp @@ -14,9 +14,8 @@ * limitations under the License. */ -#include - #include +#include using namespace folly; diff --git a/folly/futures/test/NonCopyableLambdaTest.cpp b/folly/futures/test/NonCopyableLambdaTest.cpp index 73bc6dc7..b499400a 100644 --- a/folly/futures/test/NonCopyableLambdaTest.cpp +++ b/folly/futures/test/NonCopyableLambdaTest.cpp @@ -14,9 +14,8 @@ * limitations under the License. */ -#include - #include +#include using namespace folly; diff --git a/folly/futures/test/PollTest.cpp b/folly/futures/test/PollTest.cpp index ae82fed9..c518d453 100644 --- a/folly/futures/test/PollTest.cpp +++ b/folly/futures/test/PollTest.cpp @@ -14,9 +14,8 @@ * limitations under the License. */ -#include - #include +#include using namespace folly; diff --git a/folly/futures/test/PromiseTest.cpp b/folly/futures/test/PromiseTest.cpp index 126518c0..89431a28 100644 --- a/folly/futures/test/PromiseTest.cpp +++ b/folly/futures/test/PromiseTest.cpp @@ -14,9 +14,8 @@ * limitations under the License. */ -#include - #include +#include using namespace folly; using std::unique_ptr; diff --git a/folly/futures/test/ReduceTest.cpp b/folly/futures/test/ReduceTest.cpp index bf613ef6..c5462dda 100644 --- a/folly/futures/test/ReduceTest.cpp +++ b/folly/futures/test/ReduceTest.cpp @@ -14,9 +14,8 @@ * limitations under the License. */ -#include - #include +#include using namespace folly; diff --git a/folly/futures/test/RetryingTest.cpp b/folly/futures/test/RetryingTest.cpp index a57507cd..6988e5df 100644 --- a/folly/futures/test/RetryingTest.cpp +++ b/folly/futures/test/RetryingTest.cpp @@ -18,9 +18,10 @@ #include #include #include + #include +#include -#include using namespace std; using namespace std::chrono; diff --git a/folly/futures/test/SelfDestructTest.cpp b/folly/futures/test/SelfDestructTest.cpp index 68a75d09..4638eaee 100644 --- a/folly/futures/test/SelfDestructTest.cpp +++ b/folly/futures/test/SelfDestructTest.cpp @@ -14,10 +14,9 @@ * limitations under the License. */ -#include - #include #include +#include using namespace folly; diff --git a/folly/futures/test/SharedPromiseTest.cpp b/folly/futures/test/SharedPromiseTest.cpp index b75e9f08..36b5169b 100644 --- a/folly/futures/test/SharedPromiseTest.cpp +++ b/folly/futures/test/SharedPromiseTest.cpp @@ -14,9 +14,8 @@ * limitations under the License. */ -#include - #include +#include using namespace folly; diff --git a/folly/futures/test/ThenCompileTest.h b/folly/futures/test/ThenCompileTest.h index 75eb26bd..2769ced6 100644 --- a/folly/futures/test/ThenCompileTest.h +++ b/folly/futures/test/ThenCompileTest.h @@ -16,9 +16,8 @@ #pragma once -#include - #include +#include #include diff --git a/folly/futures/test/ThenTest.cpp b/folly/futures/test/ThenTest.cpp index 4ba53988..11f59b01 100644 --- a/folly/futures/test/ThenTest.cpp +++ b/folly/futures/test/ThenTest.cpp @@ -14,9 +14,8 @@ * limitations under the License. */ -#include - #include +#include #include diff --git a/folly/futures/test/TimekeeperTest.cpp b/folly/futures/test/TimekeeperTest.cpp index c20668c0..676d6351 100644 --- a/folly/futures/test/TimekeeperTest.cpp +++ b/folly/futures/test/TimekeeperTest.cpp @@ -14,9 +14,8 @@ * limitations under the License. */ -#include - #include +#include #include using namespace folly; diff --git a/folly/futures/test/TimesTest.cpp b/folly/futures/test/TimesTest.cpp index 84549c1e..8354ef9a 100644 --- a/folly/futures/test/TimesTest.cpp +++ b/folly/futures/test/TimesTest.cpp @@ -18,11 +18,11 @@ #include #include -#include #include #include #include +#include using namespace folly; diff --git a/folly/futures/test/UnwrapTest.cpp b/folly/futures/test/UnwrapTest.cpp index be259f81..521b2964 100644 --- a/folly/futures/test/UnwrapTest.cpp +++ b/folly/futures/test/UnwrapTest.cpp @@ -14,9 +14,8 @@ * limitations under the License. */ -#include - #include +#include using namespace folly; diff --git a/folly/futures/test/ViaTest.cpp b/folly/futures/test/ViaTest.cpp index c864b902..765fdf6c 100644 --- a/folly/futures/test/ViaTest.cpp +++ b/folly/futures/test/ViaTest.cpp @@ -14,14 +14,13 @@ * limitations under the License. */ -#include - #include #include #include #include #include #include +#include #include diff --git a/folly/futures/test/WaitTest.cpp b/folly/futures/test/WaitTest.cpp index 816f48fe..380c1301 100644 --- a/folly/futures/test/WaitTest.cpp +++ b/folly/futures/test/WaitTest.cpp @@ -16,11 +16,10 @@ #include -#include - #include #include #include +#include using namespace folly; using std::vector; diff --git a/folly/futures/test/WhenTest.cpp b/folly/futures/test/WhenTest.cpp index bd8e076a..3563c428 100644 --- a/folly/futures/test/WhenTest.cpp +++ b/folly/futures/test/WhenTest.cpp @@ -17,11 +17,11 @@ #include #include -#include #include #include #include +#include using namespace folly; diff --git a/folly/futures/test/WhileDoTest.cpp b/folly/futures/test/WhileDoTest.cpp index 3c3fcc29..15fdfbf3 100644 --- a/folly/futures/test/WhileDoTest.cpp +++ b/folly/futures/test/WhileDoTest.cpp @@ -18,11 +18,11 @@ #include #include -#include #include #include #include +#include using namespace folly; diff --git a/folly/futures/test/WillEqualTest.cpp b/folly/futures/test/WillEqualTest.cpp index a560ab56..315210e5 100644 --- a/folly/futures/test/WillEqualTest.cpp +++ b/folly/futures/test/WillEqualTest.cpp @@ -14,9 +14,8 @@ * limitations under the License. */ -#include - #include +#include using namespace folly; diff --git a/folly/futures/test/WindowTest.cpp b/folly/futures/test/WindowTest.cpp index 6eecedc1..f614c5fb 100644 --- a/folly/futures/test/WindowTest.cpp +++ b/folly/futures/test/WindowTest.cpp @@ -14,12 +14,11 @@ * limitations under the License. */ -#include - #include #include #include +#include #include diff --git a/folly/gen/test/BaseTest.cpp b/folly/gen/test/BaseTest.cpp index 66b987e4..f779c4ac 100644 --- a/folly/gen/test/BaseTest.cpp +++ b/folly/gen/test/BaseTest.cpp @@ -15,7 +15,7 @@ */ #include -#include + #include #include #include @@ -28,6 +28,7 @@ #include #include #include +#include using namespace folly::gen; using namespace folly; diff --git a/folly/gen/test/CombineTest.cpp b/folly/gen/test/CombineTest.cpp index b98bdf0c..3b89946e 100644 --- a/folly/gen/test/CombineTest.cpp +++ b/folly/gen/test/CombineTest.cpp @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include #include #include #include @@ -23,6 +22,7 @@ #include #include #include +#include using namespace folly::gen; using namespace folly; diff --git a/folly/gen/test/FileTest.cpp b/folly/gen/test/FileTest.cpp index a62f2edf..00c5635d 100644 --- a/folly/gen/test/FileTest.cpp +++ b/folly/gen/test/FileTest.cpp @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include #include #include @@ -22,6 +21,7 @@ #include #include #include +#include using namespace folly::gen; using namespace folly; diff --git a/folly/gen/test/ParallelMapTest.cpp b/folly/gen/test/ParallelMapTest.cpp index 954a9f32..503b027f 100644 --- a/folly/gen/test/ParallelMapTest.cpp +++ b/folly/gen/test/ParallelMapTest.cpp @@ -17,11 +17,11 @@ #include #include -#include #include #include #include +#include using namespace folly; using namespace folly::gen; diff --git a/folly/gen/test/ParallelTest.cpp b/folly/gen/test/ParallelTest.cpp index ad4f6085..995eab0f 100644 --- a/folly/gen/test/ParallelTest.cpp +++ b/folly/gen/test/ParallelTest.cpp @@ -15,12 +15,14 @@ */ #include -#include + #include #include #include + #include #include +#include using namespace folly; using namespace folly::gen; diff --git a/folly/gen/test/StringTest.cpp b/folly/gen/test/StringTest.cpp index 65c79462..11f34b05 100644 --- a/folly/gen/test/StringTest.cpp +++ b/folly/gen/test/StringTest.cpp @@ -15,12 +15,13 @@ */ #include -#include + #include #include #include #include +#include using namespace folly::gen; using namespace folly; diff --git a/folly/io/async/ssl/test/SSLErrorsTest.cpp b/folly/io/async/ssl/test/SSLErrorsTest.cpp index f651acea..6643cf2e 100644 --- a/folly/io/async/ssl/test/SSLErrorsTest.cpp +++ b/folly/io/async/ssl/test/SSLErrorsTest.cpp @@ -16,7 +16,8 @@ #include -#include +#include + #include #include diff --git a/folly/io/async/test/AsyncPipeTest.cpp b/folly/io/async/test/AsyncPipeTest.cpp index 2a9c426f..81569dc5 100644 --- a/folly/io/async/test/AsyncPipeTest.cpp +++ b/folly/io/async/test/AsyncPipeTest.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include diff --git a/folly/io/async/test/AsyncSSLSocketTest.cpp b/folly/io/async/test/AsyncSSLSocketTest.cpp index e5dbed11..09201229 100644 --- a/folly/io/async/test/AsyncSSLSocketTest.cpp +++ b/folly/io/async/test/AsyncSSLSocketTest.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -29,7 +30,6 @@ #include #include -#include #include #include #include diff --git a/folly/io/async/test/AsyncSSLSocketTest.h b/folly/io/async/test/AsyncSSLSocketTest.h index d9618098..7ae4aeb5 100644 --- a/folly/io/async/test/AsyncSSLSocketTest.h +++ b/folly/io/async/test/AsyncSSLSocketTest.h @@ -27,11 +27,11 @@ #include #include #include +#include #include #include #include -#include #include #include #include diff --git a/folly/io/async/test/AsyncSSLSocketTest2.cpp b/folly/io/async/test/AsyncSSLSocketTest2.cpp index e39f3b73..e33df0a1 100644 --- a/folly/io/async/test/AsyncSSLSocketTest2.cpp +++ b/folly/io/async/test/AsyncSSLSocketTest2.cpp @@ -15,12 +15,12 @@ */ #include -#include #include #include #include #include +#include using std::string; using std::vector; diff --git a/folly/io/async/test/AsyncSSLSocketWriteTest.cpp b/folly/io/async/test/AsyncSSLSocketWriteTest.cpp index 13270a69..9b67ba3c 100644 --- a/folly/io/async/test/AsyncSSLSocketWriteTest.cpp +++ b/folly/io/async/test/AsyncSSLSocketWriteTest.cpp @@ -19,8 +19,8 @@ #include #include #include +#include -#include #include #include diff --git a/folly/io/async/test/AsyncSocketExceptionTest.cpp b/folly/io/async/test/AsyncSocketExceptionTest.cpp index 50c66599..d3c25d1a 100644 --- a/folly/io/async/test/AsyncSocketExceptionTest.cpp +++ b/folly/io/async/test/AsyncSocketExceptionTest.cpp @@ -17,7 +17,8 @@ #include #include -#include +#include + #include using namespace testing; diff --git a/folly/io/async/test/AsyncSocketTest.cpp b/folly/io/async/test/AsyncSocketTest.cpp index bd348bd9..261f6f2e 100644 --- a/folly/io/async/test/AsyncSocketTest.cpp +++ b/folly/io/async/test/AsyncSocketTest.cpp @@ -18,8 +18,7 @@ #include #include #include - -#include +#include namespace folly { diff --git a/folly/io/async/test/AsyncSocketTest2.cpp b/folly/io/async/test/AsyncSocketTest2.cpp index bc27b241..afd4f9e0 100644 --- a/folly/io/async/test/AsyncSocketTest2.cpp +++ b/folly/io/async/test/AsyncSocketTest2.cpp @@ -26,13 +26,13 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include #include diff --git a/folly/io/async/test/AsyncTimeoutTest.cpp b/folly/io/async/test/AsyncTimeoutTest.cpp index 18592b78..463fb3ab 100644 --- a/folly/io/async/test/AsyncTimeoutTest.cpp +++ b/folly/io/async/test/AsyncTimeoutTest.cpp @@ -16,8 +16,7 @@ #include #include - -#include +#include namespace folly { diff --git a/folly/io/async/test/AsyncTransportTest.cpp b/folly/io/async/test/AsyncTransportTest.cpp index 8a7f525b..815ba7f2 100644 --- a/folly/io/async/test/AsyncTransportTest.cpp +++ b/folly/io/async/test/AsyncTransportTest.cpp @@ -17,8 +17,7 @@ #include #include - -#include +#include using namespace testing; diff --git a/folly/io/async/test/AsyncUDPSocketTest.cpp b/folly/io/async/test/AsyncUDPSocketTest.cpp index 27ac844b..acaf76b4 100644 --- a/folly/io/async/test/AsyncUDPSocketTest.cpp +++ b/folly/io/async/test/AsyncUDPSocketTest.cpp @@ -23,11 +23,10 @@ #include #include +#include #include -#include - using folly::AsyncUDPSocket; using folly::AsyncUDPServerSocket; using folly::AsyncTimeout; diff --git a/folly/io/async/test/DelayedDestructionBaseTest.cpp b/folly/io/async/test/DelayedDestructionBaseTest.cpp index 1d7ab3fc..580b2e52 100644 --- a/folly/io/async/test/DelayedDestructionBaseTest.cpp +++ b/folly/io/async/test/DelayedDestructionBaseTest.cpp @@ -34,10 +34,11 @@ #include #include -#include #include #include +#include + using namespace folly; class DestructionOnCallback : public DelayedDestructionBase { diff --git a/folly/io/async/test/DelayedDestructionTest.cpp b/folly/io/async/test/DelayedDestructionTest.cpp index e4a3e1bb..d7836b9e 100644 --- a/folly/io/async/test/DelayedDestructionTest.cpp +++ b/folly/io/async/test/DelayedDestructionTest.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include using namespace folly; diff --git a/folly/io/async/test/EventBaseLocalTest.cpp b/folly/io/async/test/EventBaseLocalTest.cpp index 4d570ad0..50b5ecd8 100644 --- a/folly/io/async/test/EventBaseLocalTest.cpp +++ b/folly/io/async/test/EventBaseLocalTest.cpp @@ -34,7 +34,7 @@ #include #include -#include +#include struct Foo { Foo(int n, std::function dtorFn): diff --git a/folly/io/async/test/EventHandlerTest.cpp b/folly/io/async/test/EventHandlerTest.cpp index 255f2140..0c3e80c8 100644 --- a/folly/io/async/test/EventHandlerTest.cpp +++ b/folly/io/async/test/EventHandlerTest.cpp @@ -23,8 +23,8 @@ #include #include #include +#include #include -#include #include using namespace std; diff --git a/folly/io/async/test/HHWheelTimerSlowTests.cpp b/folly/io/async/test/HHWheelTimerSlowTests.cpp index 20a40cf6..3c412fb0 100644 --- a/folly/io/async/test/HHWheelTimerSlowTests.cpp +++ b/folly/io/async/test/HHWheelTimerSlowTests.cpp @@ -18,8 +18,8 @@ #include #include #include +#include -#include #include #include diff --git a/folly/io/async/test/HHWheelTimerTest.cpp b/folly/io/async/test/HHWheelTimerTest.cpp index 0ee82125..d265f34f 100644 --- a/folly/io/async/test/HHWheelTimerTest.cpp +++ b/folly/io/async/test/HHWheelTimerTest.cpp @@ -20,8 +20,8 @@ #include #include #include +#include -#include #include using namespace folly; diff --git a/folly/io/async/test/NotificationQueueTest.cpp b/folly/io/async/test/NotificationQueueTest.cpp index c24e6842..bd7a54a4 100644 --- a/folly/io/async/test/NotificationQueueTest.cpp +++ b/folly/io/async/test/NotificationQueueTest.cpp @@ -18,6 +18,8 @@ #include #include +#include + #include #include #include @@ -27,8 +29,6 @@ #include #endif -#include - using namespace std; using namespace folly; diff --git a/folly/io/async/test/RequestContextTest.cpp b/folly/io/async/test/RequestContextTest.cpp index 1f5c5e61..0ca773c3 100644 --- a/folly/io/async/test/RequestContextTest.cpp +++ b/folly/io/async/test/RequestContextTest.cpp @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -#include #include #include #include #include +#include using namespace folly; diff --git a/folly/io/async/test/ScopedEventBaseThreadTest.cpp b/folly/io/async/test/ScopedEventBaseThreadTest.cpp index 81589cb7..9d92ea83 100644 --- a/folly/io/async/test/ScopedEventBaseThreadTest.cpp +++ b/folly/io/async/test/ScopedEventBaseThreadTest.cpp @@ -18,8 +18,7 @@ #include #include - -#include +#include using namespace std; using namespace std::chrono; diff --git a/folly/io/async/test/Util.h b/folly/io/async/test/Util.h index 8f54274d..02d0670f 100644 --- a/folly/io/async/test/Util.h +++ b/folly/io/async/test/Util.h @@ -20,7 +20,7 @@ #include #include -#include +#include /** * Check how long a timeout took to fire. diff --git a/folly/io/async/test/WriteChainAsyncTransportWrapperTest.cpp b/folly/io/async/test/WriteChainAsyncTransportWrapperTest.cpp index 0baac518..e75a9318 100644 --- a/folly/io/async/test/WriteChainAsyncTransportWrapperTest.cpp +++ b/folly/io/async/test/WriteChainAsyncTransportWrapperTest.cpp @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include #include #include #include +#include using namespace testing; using testing::_; diff --git a/folly/io/test/CompressionTest.cpp b/folly/io/test/CompressionTest.cpp index d0d35af2..7de76177 100644 --- a/folly/io/test/CompressionTest.cpp +++ b/folly/io/test/CompressionTest.cpp @@ -22,13 +22,13 @@ #include #include -#include #include #include #include #include #include +#include namespace folly { namespace io { namespace test { diff --git a/folly/io/test/IOBufCursorTest.cpp b/folly/io/test/IOBufCursorTest.cpp index 08cb23d4..5c607ad2 100644 --- a/folly/io/test/IOBufCursorTest.cpp +++ b/folly/io/test/IOBufCursorTest.cpp @@ -19,8 +19,7 @@ #include #include #include - -#include +#include using folly::ByteRange; using folly::format; diff --git a/folly/io/test/IOBufQueueTest.cpp b/folly/io/test/IOBufQueueTest.cpp index 26062185..737c4bf4 100644 --- a/folly/io/test/IOBufQueueTest.cpp +++ b/folly/io/test/IOBufQueueTest.cpp @@ -20,9 +20,8 @@ #include #include -#include - #include +#include using folly::IOBuf; using folly::IOBufQueue; diff --git a/folly/io/test/IOBufTest.cpp b/folly/io/test/IOBufTest.cpp index c012debd..a615496c 100644 --- a/folly/io/test/IOBufTest.cpp +++ b/folly/io/test/IOBufTest.cpp @@ -20,10 +20,10 @@ #include #include -#include #include #include +#include using folly::fbstring; using folly::fbvector; diff --git a/folly/io/test/RecordIOTest.cpp b/folly/io/test/RecordIOTest.cpp index 9154b8ac..79985b5b 100644 --- a/folly/io/test/RecordIOTest.cpp +++ b/folly/io/test/RecordIOTest.cpp @@ -21,7 +21,6 @@ #include #include -#include #include #include @@ -29,6 +28,7 @@ #include #include #include +#include #include DEFINE_int32(random_seed, folly::randomNumberSeed(), "random seed"); diff --git a/folly/io/test/ShutdownSocketSetTest.cpp b/folly/io/test/ShutdownSocketSetTest.cpp index 0b1e1443..1ddebdb8 100644 --- a/folly/io/test/ShutdownSocketSetTest.cpp +++ b/folly/io/test/ShutdownSocketSetTest.cpp @@ -20,8 +20,8 @@ #include #include -#include +#include #include using folly::ShutdownSocketSet; diff --git a/folly/portability/test/ConstexprTest.cpp b/folly/portability/test/ConstexprTest.cpp index 1bf74382..37f5132c 100644 --- a/folly/portability/test/ConstexprTest.cpp +++ b/folly/portability/test/ConstexprTest.cpp @@ -16,7 +16,7 @@ #include -#include +#include namespace { diff --git a/folly/portability/test/LibgenTest.cpp b/folly/portability/test/LibgenTest.cpp index 9d258a58..737f1bf2 100755 --- a/folly/portability/test/LibgenTest.cpp +++ b/folly/portability/test/LibgenTest.cpp @@ -16,8 +16,7 @@ #include -#include - +#include #include TEST(Libgen, dirname) { diff --git a/folly/portability/test/TimeTest.cpp b/folly/portability/test/TimeTest.cpp index 83ecc0c2..0df8f2b9 100644 --- a/folly/portability/test/TimeTest.cpp +++ b/folly/portability/test/TimeTest.cpp @@ -17,11 +17,10 @@ #include #include +#include #include -#include - static constexpr auto kAcceptableDeltaSecs = std::chrono::seconds(120); using folly::test::AreWithinSecs; diff --git a/folly/ssl/test/OpenSSLHashTest.cpp b/folly/ssl/test/OpenSSLHashTest.cpp index 129cf406..1e2c9e6a 100644 --- a/folly/ssl/test/OpenSSLHashTest.cpp +++ b/folly/ssl/test/OpenSSLHashTest.cpp @@ -16,9 +16,8 @@ #include -#include - #include +#include using namespace std; using namespace folly; diff --git a/folly/test/AHMIntStressTest.cpp b/folly/test/AHMIntStressTest.cpp index 7fc6251c..dbe7d953 100644 --- a/folly/test/AHMIntStressTest.cpp +++ b/folly/test/AHMIntStressTest.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#include - #include #include #include @@ -23,6 +21,7 @@ #include #include #include +#include namespace { diff --git a/folly/test/ApplyTupleTest.cpp b/folly/test/ApplyTupleTest.cpp index e29c9914..8aff7d07 100644 --- a/folly/test/ApplyTupleTest.cpp +++ b/folly/test/ApplyTupleTest.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include diff --git a/folly/test/ArenaSmartPtrTest.cpp b/folly/test/ArenaSmartPtrTest.cpp index e49d2709..1ac482de 100644 --- a/folly/test/ArenaSmartPtrTest.cpp +++ b/folly/test/ArenaSmartPtrTest.cpp @@ -20,8 +20,7 @@ #include #include - -#include +#include using namespace folly; diff --git a/folly/test/ArenaTest.cpp b/folly/test/ArenaTest.cpp index 93d74e87..b754f970 100644 --- a/folly/test/ArenaTest.cpp +++ b/folly/test/ArenaTest.cpp @@ -16,12 +16,12 @@ #include #include +#include #include #include #include -#include using namespace folly; diff --git a/folly/test/ArrayTest.cpp b/folly/test/ArrayTest.cpp index 2bfc73a8..c50270df 100644 --- a/folly/test/ArrayTest.cpp +++ b/folly/test/ArrayTest.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ #include -#include +#include #include using namespace std; diff --git a/folly/test/AsciiCaseInsensitiveTest.cpp b/folly/test/AsciiCaseInsensitiveTest.cpp index ec7f078f..86ebd7bc 100644 --- a/folly/test/AsciiCaseInsensitiveTest.cpp +++ b/folly/test/AsciiCaseInsensitiveTest.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include using namespace std; diff --git a/folly/test/AtomicBitSetTest.cpp b/folly/test/AtomicBitSetTest.cpp index 3823ad2b..57c50beb 100644 --- a/folly/test/AtomicBitSetTest.cpp +++ b/folly/test/AtomicBitSetTest.cpp @@ -16,8 +16,9 @@ #include +#include + #include -#include namespace folly { namespace test { diff --git a/folly/test/AtomicHashArrayTest.cpp b/folly/test/AtomicHashArrayTest.cpp index 9e53635e..b6b9e9a5 100644 --- a/folly/test/AtomicHashArrayTest.cpp +++ b/folly/test/AtomicHashArrayTest.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include using namespace std; using namespace folly; diff --git a/folly/test/AtomicHashMapTest.cpp b/folly/test/AtomicHashMapTest.cpp index 32ad64d0..c3955395 100644 --- a/folly/test/AtomicHashMapTest.cpp +++ b/folly/test/AtomicHashMapTest.cpp @@ -17,7 +17,6 @@ #include #include -#include #include #include #include @@ -26,6 +25,7 @@ #include #include #include +#include #include using std::vector; diff --git a/folly/test/AtomicLinkedListTest.cpp b/folly/test/AtomicLinkedListTest.cpp index b13c24c9..ad09e12f 100644 --- a/folly/test/AtomicLinkedListTest.cpp +++ b/folly/test/AtomicLinkedListTest.cpp @@ -17,9 +17,8 @@ #include #include -#include - #include +#include class TestIntrusiveObject { public: diff --git a/folly/test/AtomicStructTest.cpp b/folly/test/AtomicStructTest.cpp index b6d0a074..554722e0 100644 --- a/folly/test/AtomicStructTest.cpp +++ b/folly/test/AtomicStructTest.cpp @@ -16,7 +16,7 @@ #include -#include +#include using namespace folly; diff --git a/folly/test/AtomicUnorderedMapTest.cpp b/folly/test/AtomicUnorderedMapTest.cpp index c9c42384..e1a0104c 100644 --- a/folly/test/AtomicUnorderedMapTest.cpp +++ b/folly/test/AtomicUnorderedMapTest.cpp @@ -20,10 +20,9 @@ #include #include -#include - #include #include +#include #include using namespace folly; diff --git a/folly/test/BatonBenchmark.cpp b/folly/test/BatonBenchmark.cpp index 099226a8..b261ac94 100644 --- a/folly/test/BatonBenchmark.cpp +++ b/folly/test/BatonBenchmark.cpp @@ -19,10 +19,9 @@ #include #include -#include - #include #include +#include #include #include diff --git a/folly/test/BatonTest.cpp b/folly/test/BatonTest.cpp index eaeb5ad6..4fbc6959 100644 --- a/folly/test/BatonTest.cpp +++ b/folly/test/BatonTest.cpp @@ -17,9 +17,10 @@ #include #include #include +#include + #include #include -#include using namespace folly; using namespace folly::test; diff --git a/folly/test/BatonTestHelpers.h b/folly/test/BatonTestHelpers.h index 0d86b361..7efbd3e9 100644 --- a/folly/test/BatonTestHelpers.h +++ b/folly/test/BatonTestHelpers.h @@ -18,8 +18,7 @@ #include #include - -#include +#include namespace folly { namespace test { diff --git a/folly/test/BitIteratorTest.cpp b/folly/test/BitIteratorTest.cpp index fdf49b21..f9b2b1d8 100644 --- a/folly/test/BitIteratorTest.cpp +++ b/folly/test/BitIteratorTest.cpp @@ -21,10 +21,9 @@ #include #include -#include - #include #include +#include using namespace folly; using namespace folly::bititerator_detail; diff --git a/folly/test/BitsTest.cpp b/folly/test/BitsTest.cpp index 2b2a1401..4f6ed676 100644 --- a/folly/test/BitsTest.cpp +++ b/folly/test/BitsTest.cpp @@ -18,7 +18,7 @@ #include -#include +#include using namespace folly; diff --git a/folly/test/CacheLocalityTest.cpp b/folly/test/CacheLocalityTest.cpp index 33af739b..dd46e79b 100644 --- a/folly/test/CacheLocalityTest.cpp +++ b/folly/test/CacheLocalityTest.cpp @@ -16,13 +16,14 @@ #include +#include + #include #include #include #include #include #include -#include using namespace folly::detail; diff --git a/folly/test/CachelinePaddedTest.cpp b/folly/test/CachelinePaddedTest.cpp index 9eca058a..c67c3161 100644 --- a/folly/test/CachelinePaddedTest.cpp +++ b/folly/test/CachelinePaddedTest.cpp @@ -18,7 +18,7 @@ #include -#include +#include using folly::CachelinePadded; diff --git a/folly/test/CallOnceTest.cpp b/folly/test/CallOnceTest.cpp index 4a4b291d..843fa481 100644 --- a/folly/test/CallOnceTest.cpp +++ b/folly/test/CallOnceTest.cpp @@ -20,9 +20,9 @@ #include #include +#include #include -#include DEFINE_int32(threads, 16, "benchmark concurrency"); diff --git a/folly/test/ChecksumTest.cpp b/folly/test/ChecksumTest.cpp index a82bf75e..3e93e9f3 100644 --- a/folly/test/ChecksumTest.cpp +++ b/folly/test/ChecksumTest.cpp @@ -16,12 +16,12 @@ #include -#include #include #include #include #include +#include namespace { const unsigned int BUFFER_SIZE = 512 * 1024 * sizeof(uint64_t); diff --git a/folly/test/ClockGettimeWrappersTest.cpp b/folly/test/ClockGettimeWrappersTest.cpp index 8516d6d9..4d1950a7 100644 --- a/folly/test/ClockGettimeWrappersTest.cpp +++ b/folly/test/ClockGettimeWrappersTest.cpp @@ -17,11 +17,10 @@ #include #include +#include #include -#include - 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 b63be004..cdd72ac0 100644 --- a/folly/test/ConcurrentSkipListTest.cpp +++ b/folly/test/ConcurrentSkipListTest.cpp @@ -26,13 +26,13 @@ #include #include -#include #include #include #include #include #include +#include DEFINE_int32(num_threads, 12, "num concurrent threads to test"); diff --git a/folly/test/ContainerTraitsTest.cpp b/folly/test/ContainerTraitsTest.cpp index d3894e3a..4ca5a818 100644 --- a/folly/test/ContainerTraitsTest.cpp +++ b/folly/test/ContainerTraitsTest.cpp @@ -16,7 +16,7 @@ #include -#include +#include using namespace std; using namespace folly; diff --git a/folly/test/ConvTest.cpp b/folly/test/ConvTest.cpp index fd26293e..878171a2 100644 --- a/folly/test/ConvTest.cpp +++ b/folly/test/ConvTest.cpp @@ -19,9 +19,11 @@ #endif #include + #include #include -#include +#include + #include #include #include diff --git a/folly/test/CpuIdTest.cpp b/folly/test/CpuIdTest.cpp index 28c43e79..c1465aa4 100644 --- a/folly/test/CpuIdTest.cpp +++ b/folly/test/CpuIdTest.cpp @@ -16,7 +16,7 @@ #include -#include +#include using namespace folly; diff --git a/folly/test/DemangleTest.cpp b/folly/test/DemangleTest.cpp index 1316319f..78c99331 100644 --- a/folly/test/DemangleTest.cpp +++ b/folly/test/DemangleTest.cpp @@ -16,7 +16,7 @@ #include -#include +#include using folly::demangle; diff --git a/folly/test/DeterministicScheduleTest.cpp b/folly/test/DeterministicScheduleTest.cpp index db22703b..7153f2b5 100644 --- a/folly/test/DeterministicScheduleTest.cpp +++ b/folly/test/DeterministicScheduleTest.cpp @@ -16,9 +16,8 @@ #include -#include - #include +#include using namespace folly::test; diff --git a/folly/test/DiscriminatedPtrTest.cpp b/folly/test/DiscriminatedPtrTest.cpp index 916b7943..338621d9 100644 --- a/folly/test/DiscriminatedPtrTest.cpp +++ b/folly/test/DiscriminatedPtrTest.cpp @@ -16,7 +16,7 @@ #include -#include +#include using namespace folly; diff --git a/folly/test/DynamicConverterTest.cpp b/folly/test/DynamicConverterTest.cpp index 1d45e67d..942f6b27 100644 --- a/folly/test/DynamicConverterTest.cpp +++ b/folly/test/DynamicConverterTest.cpp @@ -18,8 +18,9 @@ #include +#include + #include -#include #include #include diff --git a/folly/test/DynamicOtherTest.cpp b/folly/test/DynamicOtherTest.cpp index bf3b462f..df755294 100644 --- a/folly/test/DynamicOtherTest.cpp +++ b/folly/test/DynamicOtherTest.cpp @@ -19,8 +19,7 @@ #include #include #include - -#include +#include #include diff --git a/folly/test/DynamicTest.cpp b/folly/test/DynamicTest.cpp index 0fa5bdc2..624118e4 100644 --- a/folly/test/DynamicTest.cpp +++ b/folly/test/DynamicTest.cpp @@ -16,8 +16,9 @@ #include +#include + #include -#include using folly::dynamic; diff --git a/folly/test/EndianTest.cpp b/folly/test/EndianTest.cpp index f57bea9f..93b0390e 100644 --- a/folly/test/EndianTest.cpp +++ b/folly/test/EndianTest.cpp @@ -16,7 +16,7 @@ #include -#include +#include using namespace folly; diff --git a/folly/test/EnumerateTest.cpp b/folly/test/EnumerateTest.cpp index 47ae5cd9..b3ed18d7 100644 --- a/folly/test/EnumerateTest.cpp +++ b/folly/test/EnumerateTest.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include TEST(Enumerate, Basic) { std::vector v = {"abc", "a", "ab"}; diff --git a/folly/test/EvictingCacheMapTest.cpp b/folly/test/EvictingCacheMapTest.cpp index 7991a4c3..0c305907 100644 --- a/folly/test/EvictingCacheMapTest.cpp +++ b/folly/test/EvictingCacheMapTest.cpp @@ -14,11 +14,10 @@ * limitations under the License. */ -#include - #include #include +#include using namespace folly; diff --git a/folly/test/ExceptionTest.cpp b/folly/test/ExceptionTest.cpp index a77725d9..cc0378c9 100644 --- a/folly/test/ExceptionTest.cpp +++ b/folly/test/ExceptionTest.cpp @@ -17,12 +17,12 @@ #include #include +#include #include #include #include -#include namespace folly { namespace test { diff --git a/folly/test/ExceptionWrapperTest.cpp b/folly/test/ExceptionWrapperTest.cpp index a3b17e04..dc3a0ac6 100644 --- a/folly/test/ExceptionWrapperTest.cpp +++ b/folly/test/ExceptionWrapperTest.cpp @@ -14,11 +14,12 @@ * limitations under the License. */ -#include #include + #include #include #include +#include using namespace folly; diff --git a/folly/test/ExpectedTest.cpp b/folly/test/ExpectedTest.cpp index 52c09039..a10c9e86 100644 --- a/folly/test/ExpectedTest.cpp +++ b/folly/test/ExpectedTest.cpp @@ -16,6 +16,7 @@ #include #include +#include #include #include @@ -25,7 +26,6 @@ #include #include -#include using std::unique_ptr; using std::shared_ptr; diff --git a/folly/test/FBStringTest.cpp b/folly/test/FBStringTest.cpp index c6945a1f..a31038f7 100644 --- a/folly/test/FBStringTest.cpp +++ b/folly/test/FBStringTest.cpp @@ -27,12 +27,12 @@ #include #include #include -#include #include #include #include #include +#include using namespace std; using namespace folly; diff --git a/folly/test/FBVectorBenchmark.cpp b/folly/test/FBVectorBenchmark.cpp index 0b676912..cd950370 100644 --- a/folly/test/FBVectorBenchmark.cpp +++ b/folly/test/FBVectorBenchmark.cpp @@ -24,8 +24,8 @@ #include #include #include +#include -#include #include #include #include diff --git a/folly/test/FBVectorTest.cpp b/folly/test/FBVectorTest.cpp index 33a164a0..54f64efe 100644 --- a/folly/test/FBVectorTest.cpp +++ b/folly/test/FBVectorTest.cpp @@ -22,8 +22,8 @@ #include #include #include +#include -#include #include #include #include diff --git a/folly/test/FileLockTest.cpp b/folly/test/FileLockTest.cpp index eaf302ea..eb25bfb0 100644 --- a/folly/test/FileLockTest.cpp +++ b/folly/test/FileLockTest.cpp @@ -19,7 +19,6 @@ #include #include -#include #include #include @@ -27,6 +26,7 @@ #include #include #include +#include using namespace folly; using namespace folly::test; diff --git a/folly/test/FileTest.cpp b/folly/test/FileTest.cpp index 290c53da..4651f7b0 100644 --- a/folly/test/FileTest.cpp +++ b/folly/test/FileTest.cpp @@ -18,8 +18,7 @@ #include #include - -#include +#include using namespace folly; diff --git a/folly/test/FileUtilTest.cpp b/folly/test/FileUtilTest.cpp index 6526efa2..26cfde95 100644 --- a/folly/test/FileUtilTest.cpp +++ b/folly/test/FileUtilTest.cpp @@ -21,11 +21,11 @@ #include #include -#include #include #include #include +#include namespace folly { namespace test { diff --git a/folly/test/FingerprintTest.cpp b/folly/test/FingerprintTest.cpp index 94a57407..62de0481 100644 --- a/folly/test/FingerprintTest.cpp +++ b/folly/test/FingerprintTest.cpp @@ -17,10 +17,10 @@ #include #include -#include #include #include +#include using namespace folly; using namespace folly::detail; diff --git a/folly/test/ForeachBenchmark.cpp b/folly/test/ForeachBenchmark.cpp index dfb24445..e3a96f07 100644 --- a/folly/test/ForeachBenchmark.cpp +++ b/folly/test/ForeachBenchmark.cpp @@ -17,8 +17,8 @@ #include #include +#include -#include #include using namespace folly; diff --git a/folly/test/ForeachTest.cpp b/folly/test/ForeachTest.cpp index bba0413d..9904084d 100644 --- a/folly/test/ForeachTest.cpp +++ b/folly/test/ForeachTest.cpp @@ -16,7 +16,8 @@ #include -#include +#include + #include #include #include diff --git a/folly/test/FormatOtherTest.cpp b/folly/test/FormatOtherTest.cpp index 95132166..466d3c65 100644 --- a/folly/test/FormatOtherTest.cpp +++ b/folly/test/FormatOtherTest.cpp @@ -17,13 +17,13 @@ #include #include -#include #include #include #include #include #include +#include using namespace folly; diff --git a/folly/test/FormatTest.cpp b/folly/test/FormatTest.cpp index d1d8c96a..f8e27e31 100644 --- a/folly/test/FormatTest.cpp +++ b/folly/test/FormatTest.cpp @@ -16,7 +16,7 @@ #include -#include +#include #include diff --git a/folly/test/FunctionSchedulerTest.cpp b/folly/test/FunctionSchedulerTest.cpp index 4fed1e90..bfe2afb1 100644 --- a/folly/test/FunctionSchedulerTest.cpp +++ b/folly/test/FunctionSchedulerTest.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ #include -#include #include +#include namespace folly { diff --git a/folly/test/FunctionTest.cpp b/folly/test/FunctionTest.cpp index 1c18e481..b23eb3e9 100644 --- a/folly/test/FunctionTest.cpp +++ b/folly/test/FunctionTest.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include using folly::Function; diff --git a/folly/test/FutexTest.cpp b/folly/test/FutexTest.cpp index 36d11f8e..da7dca3c 100644 --- a/folly/test/FutexTest.cpp +++ b/folly/test/FutexTest.cpp @@ -23,9 +23,9 @@ #include #include -#include #include +#include using namespace folly::detail; using namespace folly::test; diff --git a/folly/test/GroupVarintTest.cpp b/folly/test/GroupVarintTest.cpp index 8b05713c..2f2dcf82 100644 --- a/folly/test/GroupVarintTest.cpp +++ b/folly/test/GroupVarintTest.cpp @@ -21,7 +21,7 @@ // On platforms where it's not supported, GroupVarint will be compiled out. #if HAVE_GROUP_VARINT -#include +#include using namespace folly; diff --git a/folly/test/HasMemberFnTraitsTest.cpp b/folly/test/HasMemberFnTraitsTest.cpp index dc8c0f98..2414eeef 100644 --- a/folly/test/HasMemberFnTraitsTest.cpp +++ b/folly/test/HasMemberFnTraitsTest.cpp @@ -20,7 +20,8 @@ #include -#include +#include + #include #include diff --git a/folly/test/HashTest.cpp b/folly/test/HashTest.cpp index 62618d31..e2c8e38a 100644 --- a/folly/test/HashTest.cpp +++ b/folly/test/HashTest.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include #include diff --git a/folly/test/HistogramTest.cpp b/folly/test/HistogramTest.cpp index 680d8c0c..c7b233c6 100644 --- a/folly/test/HistogramTest.cpp +++ b/folly/test/HistogramTest.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include using folly::Histogram; diff --git a/folly/test/IPAddressTest.cpp b/folly/test/IPAddressTest.cpp index 5097eafa..9fc746d7 100644 --- a/folly/test/IPAddressTest.cpp +++ b/folly/test/IPAddressTest.cpp @@ -16,13 +16,12 @@ #include -#include - #include #include #include #include #include +#include using namespace folly; using namespace std; diff --git a/folly/test/IPAddressTest.h b/folly/test/IPAddressTest.h index 01aa3c49..20633b16 100644 --- a/folly/test/IPAddressTest.h +++ b/folly/test/IPAddressTest.h @@ -18,11 +18,10 @@ #include -#include - #include #include +#include #include namespace folly { diff --git a/folly/test/IndestructibleTest.cpp b/folly/test/IndestructibleTest.cpp index 6ee8005d..4e144eec 100644 --- a/folly/test/IndestructibleTest.cpp +++ b/folly/test/IndestructibleTest.cpp @@ -20,8 +20,9 @@ #include #include #include -#include + #include +#include using namespace std; using namespace folly; diff --git a/folly/test/IndexedMemPoolTest.cpp b/folly/test/IndexedMemPoolTest.cpp index 03e24ee2..1cfa6907 100644 --- a/folly/test/IndexedMemPoolTest.cpp +++ b/folly/test/IndexedMemPoolTest.cpp @@ -16,11 +16,12 @@ #include #include +#include #include + #include #include #include -#include using namespace folly; using namespace folly::test; diff --git a/folly/test/JsonOtherTest.cpp b/folly/test/JsonOtherTest.cpp index 01fd4cff..dd1a5b83 100644 --- a/folly/test/JsonOtherTest.cpp +++ b/folly/test/JsonOtherTest.cpp @@ -19,8 +19,7 @@ #include #include #include - -#include +#include using folly::dynamic; using folly::parseJson; diff --git a/folly/test/JsonTest.cpp b/folly/test/JsonTest.cpp index a57b493c..805cb300 100644 --- a/folly/test/JsonTest.cpp +++ b/folly/test/JsonTest.cpp @@ -16,8 +16,9 @@ #include #include + #include -#include +#include using folly::dynamic; using folly::parseJson; diff --git a/folly/test/LazyTest.cpp b/folly/test/LazyTest.cpp index 373d2245..5a11ff98 100644 --- a/folly/test/LazyTest.cpp +++ b/folly/test/LazyTest.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include namespace folly { diff --git a/folly/test/LifoSemTests.cpp b/folly/test/LifoSemTests.cpp index 09234c9e..c16fe4a0 100644 --- a/folly/test/LifoSemTests.cpp +++ b/folly/test/LifoSemTests.cpp @@ -19,12 +19,11 @@ #include #include -#include - #include #include #include #include +#include #include using namespace folly; diff --git a/folly/test/LockTraitsTest.cpp b/folly/test/LockTraitsTest.cpp index d77d8206..677a6516 100644 --- a/folly/test/LockTraitsTest.cpp +++ b/folly/test/LockTraitsTest.cpp @@ -16,12 +16,12 @@ #include #include -#include #include #include #include #include +#include using namespace folly; diff --git a/folly/test/LoggingTest.cpp b/folly/test/LoggingTest.cpp index 734640de..9b752c54 100644 --- a/folly/test/LoggingTest.cpp +++ b/folly/test/LoggingTest.cpp @@ -16,7 +16,7 @@ #include -#include +#include #include diff --git a/folly/test/MPMCPipelineTest.cpp b/folly/test/MPMCPipelineTest.cpp index 1914b673..aed9f969 100644 --- a/folly/test/MPMCPipelineTest.cpp +++ b/folly/test/MPMCPipelineTest.cpp @@ -20,9 +20,9 @@ #include #include -#include #include +#include namespace folly { namespace test { diff --git a/folly/test/MPMCQueueTest.cpp b/folly/test/MPMCQueueTest.cpp index f4a195a4..cc9e8c12 100644 --- a/folly/test/MPMCQueueTest.cpp +++ b/folly/test/MPMCQueueTest.cpp @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -28,8 +29,6 @@ #include #include -#include - FOLLY_ASSUME_FBVECTOR_COMPATIBLE_1(boost::intrusive_ptr); using namespace folly; diff --git a/folly/test/MacAddressTest.cpp b/folly/test/MacAddressTest.cpp index b97ea211..ae70a9c0 100644 --- a/folly/test/MacAddressTest.cpp +++ b/folly/test/MacAddressTest.cpp @@ -14,11 +14,10 @@ * limitations under the License. */ -#include - #include #include #include +#include using folly::MacAddress; using folly::IPAddressV6; diff --git a/folly/test/MallctlHelperTest.cpp b/folly/test/MallctlHelperTest.cpp index ad665998..04236c8e 100644 --- a/folly/test/MallctlHelperTest.cpp +++ b/folly/test/MallctlHelperTest.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include using namespace folly; diff --git a/folly/test/MapUtilTest.cpp b/folly/test/MapUtilTest.cpp index 7ba12a98..4584faf1 100644 --- a/folly/test/MapUtilTest.cpp +++ b/folly/test/MapUtilTest.cpp @@ -17,7 +17,8 @@ #include #include -#include + +#include using namespace folly; diff --git a/folly/test/MathTest.cpp b/folly/test/MathTest.cpp index 166d2a74..60c6b2bf 100644 --- a/folly/test/MathTest.cpp +++ b/folly/test/MathTest.cpp @@ -22,9 +22,9 @@ #include #include -#include #include +#include using namespace folly; using namespace folly::detail; diff --git a/folly/test/MemcpyTest.cpp b/folly/test/MemcpyTest.cpp index f6635f4e..9c4a141f 100644 --- a/folly/test/MemcpyTest.cpp +++ b/folly/test/MemcpyTest.cpp @@ -16,7 +16,7 @@ #include -#include +#include namespace { diff --git a/folly/test/MemoryIdlerTest.cpp b/folly/test/MemoryIdlerTest.cpp index d1536d0b..74e377a8 100644 --- a/folly/test/MemoryIdlerTest.cpp +++ b/folly/test/MemoryIdlerTest.cpp @@ -18,6 +18,7 @@ #include #include +#include #include #include @@ -25,8 +26,6 @@ #include #include -#include - using namespace folly; using namespace folly::detail; using namespace testing; diff --git a/folly/test/MemoryMappingTest.cpp b/folly/test/MemoryMappingTest.cpp index 1d80cd2e..f438c66c 100644 --- a/folly/test/MemoryMappingTest.cpp +++ b/folly/test/MemoryMappingTest.cpp @@ -19,10 +19,9 @@ #include #include #include +#include #include -#include - static constexpr double kSomeDouble = 3.14; namespace folly { diff --git a/folly/test/MemoryTest.cpp b/folly/test/MemoryTest.cpp index c35e40b9..d7660476 100644 --- a/folly/test/MemoryTest.cpp +++ b/folly/test/MemoryTest.cpp @@ -17,9 +17,9 @@ #include #include #include +#include #include -#include #include diff --git a/folly/test/MergeTest.cpp b/folly/test/MergeTest.cpp index 880c5e98..ae0693b1 100644 --- a/folly/test/MergeTest.cpp +++ b/folly/test/MergeTest.cpp @@ -15,10 +15,12 @@ */ #include -#include + #include #include +#include + TEST(MergeTest, NonOverlapping) { std::vector a = {0, 2, 4, 6}; std::vector b = {1, 3, 5, 7}; diff --git a/folly/test/MoveWrapperTest.cpp b/folly/test/MoveWrapperTest.cpp index 74b283e3..168af64f 100644 --- a/folly/test/MoveWrapperTest.cpp +++ b/folly/test/MoveWrapperTest.cpp @@ -14,11 +14,12 @@ * limitations under the License. */ -#include - #include + #include +#include + namespace folly { TEST(makeMoveWrapper, Empty) { diff --git a/folly/test/OptionalTest.cpp b/folly/test/OptionalTest.cpp index 0fc31e0b..96f6e5ca 100644 --- a/folly/test/OptionalTest.cpp +++ b/folly/test/OptionalTest.cpp @@ -16,6 +16,7 @@ #include #include +#include #include #include @@ -25,7 +26,6 @@ #include #include -#include #include using std::unique_ptr; diff --git a/folly/test/PackedSyncPtrTest.cpp b/folly/test/PackedSyncPtrTest.cpp index c5b28b26..b83dd679 100644 --- a/folly/test/PackedSyncPtrTest.cpp +++ b/folly/test/PackedSyncPtrTest.cpp @@ -17,11 +17,12 @@ #include #include -#include #include #include #include +#include + using folly::PackedSyncPtr; namespace { diff --git a/folly/test/PaddedTest.cpp b/folly/test/PaddedTest.cpp index b86e2090..017a02d1 100644 --- a/folly/test/PaddedTest.cpp +++ b/folly/test/PaddedTest.cpp @@ -17,7 +17,8 @@ #include #include -#include + +#include using namespace folly; diff --git a/folly/test/PartialTest.cpp b/folly/test/PartialTest.cpp index 025cd25f..1d19e020 100644 --- a/folly/test/PartialTest.cpp +++ b/folly/test/PartialTest.cpp @@ -17,7 +17,8 @@ #include #include -#include + +#include using folly::partial; diff --git a/folly/test/PortabilityTest.cpp b/folly/test/PortabilityTest.cpp index 8ff47aa0..58d104d9 100644 --- a/folly/test/PortabilityTest.cpp +++ b/folly/test/PortabilityTest.cpp @@ -18,7 +18,7 @@ #include -#include +#include class Base { public: diff --git a/folly/test/ProducerConsumerQueueTest.cpp b/folly/test/ProducerConsumerQueueTest.cpp index bd1fa0c3..4fe0a665 100644 --- a/folly/test/ProducerConsumerQueueTest.cpp +++ b/folly/test/ProducerConsumerQueueTest.cpp @@ -23,7 +23,8 @@ #include #include -#include + +#include ////////////////////////////////////////////////////////////////////// diff --git a/folly/test/RWSpinLockTest.cpp b/folly/test/RWSpinLockTest.cpp index a6a40415..edf037ba 100644 --- a/folly/test/RWSpinLockTest.cpp +++ b/folly/test/RWSpinLockTest.cpp @@ -25,9 +25,9 @@ #include #include -#include #include +#include #include DEFINE_int32(num_threads, 8, "num threads"); diff --git a/folly/test/RandomTest.cpp b/folly/test/RandomTest.cpp index d7c4f4a5..7d175b6e 100644 --- a/folly/test/RandomTest.cpp +++ b/folly/test/RandomTest.cpp @@ -17,13 +17,14 @@ #include #include -#include #include #include #include #include +#include + using namespace folly; TEST(Random, StateSize) { diff --git a/folly/test/RangeTest.cpp b/folly/test/RangeTest.cpp index 0a1d03ac..ef4c1e1e 100644 --- a/folly/test/RangeTest.cpp +++ b/folly/test/RangeTest.cpp @@ -19,6 +19,7 @@ #include +#include #include #include @@ -31,7 +32,6 @@ #include #include #include -#include using namespace folly; using namespace folly::detail; diff --git a/folly/test/SafeAssertTest.cpp b/folly/test/SafeAssertTest.cpp index bfaa3dd6..0cb59b96 100644 --- a/folly/test/SafeAssertTest.cpp +++ b/folly/test/SafeAssertTest.cpp @@ -17,9 +17,9 @@ #include #include -#include #include +#include using namespace folly; diff --git a/folly/test/ScopeGuardTest.cpp b/folly/test/ScopeGuardTest.cpp index 93507da2..892a4352 100644 --- a/folly/test/ScopeGuardTest.cpp +++ b/folly/test/ScopeGuardTest.cpp @@ -17,12 +17,13 @@ #include #include -#include #include #include #include +#include + using folly::ScopeGuard; using folly::makeGuard; using std::vector; diff --git a/folly/test/SharedMutexTest.cpp b/folly/test/SharedMutexTest.cpp index 7ca55239..dc0274c8 100644 --- a/folly/test/SharedMutexTest.cpp +++ b/folly/test/SharedMutexTest.cpp @@ -20,7 +20,6 @@ #include #include -#include #include #include @@ -29,6 +28,7 @@ #include #include #include +#include #include using namespace folly; diff --git a/folly/test/SingletonTest.cpp b/folly/test/SingletonTest.cpp index 627c9547..6e8b2323 100644 --- a/folly/test/SingletonTest.cpp +++ b/folly/test/SingletonTest.cpp @@ -21,10 +21,10 @@ #include #include #include +#include #include #include -#include #include using namespace folly; diff --git a/folly/test/SingletonTestGlobal.cpp b/folly/test/SingletonTestGlobal.cpp index 7410d5f1..d62f41d1 100644 --- a/folly/test/SingletonTestGlobal.cpp +++ b/folly/test/SingletonTestGlobal.cpp @@ -20,9 +20,9 @@ #include #include #include +#include #include -#include /* * This test needs to be in its own file, as a standalone program. diff --git a/folly/test/SingletonTestStructs.h b/folly/test/SingletonTestStructs.h index fecf5373..d8a90c9c 100644 --- a/folly/test/SingletonTestStructs.h +++ b/folly/test/SingletonTestStructs.h @@ -20,7 +20,8 @@ #include #include -#include + +#include // A simple class that tracks how often instances of the class and // subclasses are created, and the ordering. Also tracks a global diff --git a/folly/test/SingletonVaultCTest.cpp b/folly/test/SingletonVaultCTest.cpp index 00e9f5b9..471cc357 100644 --- a/folly/test/SingletonVaultCTest.cpp +++ b/folly/test/SingletonVaultCTest.cpp @@ -17,10 +17,10 @@ #include #include -#include - #include +#include + FOLLY_TLS long instance_counter_instances = 0; class InstanceCounter { diff --git a/folly/test/SmallLocksTest.cpp b/folly/test/SmallLocksTest.cpp index 41c2ce65..020c7136 100644 --- a/folly/test/SmallLocksTest.cpp +++ b/folly/test/SmallLocksTest.cpp @@ -28,9 +28,8 @@ #include -#include - #include +#include #include using folly::MSLGuard; diff --git a/folly/test/SocketAddressTest.cpp b/folly/test/SocketAddressTest.cpp index 145aa863..200f7258 100644 --- a/folly/test/SocketAddressTest.cpp +++ b/folly/test/SocketAddressTest.cpp @@ -16,11 +16,11 @@ #include -#include #include #include #include +#include #include #include #include diff --git a/folly/test/SparseByteSetTest.cpp b/folly/test/SparseByteSetTest.cpp index f5f6f1a1..418d797d 100644 --- a/folly/test/SparseByteSetTest.cpp +++ b/folly/test/SparseByteSetTest.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include using namespace std; using namespace folly; diff --git a/folly/test/SpinLockTest.cpp b/folly/test/SpinLockTest.cpp index 6d028af1..03122402 100644 --- a/folly/test/SpinLockTest.cpp +++ b/folly/test/SpinLockTest.cpp @@ -17,10 +17,10 @@ #include -#include #include #include +#include using folly::SpinLockGuardImpl; diff --git a/folly/test/SpookyHashV1Test.cpp b/folly/test/SpookyHashV1Test.cpp index 9748a759..4b81ce19 100644 --- a/folly/test/SpookyHashV1Test.cpp +++ b/folly/test/SpookyHashV1Test.cpp @@ -22,6 +22,7 @@ #include #include +#include #include #include @@ -30,8 +31,6 @@ #include #include -#include - using namespace ::folly::hash; static bool failed = false; diff --git a/folly/test/SpookyHashV2Test.cpp b/folly/test/SpookyHashV2Test.cpp index 65503baa..c1703187 100644 --- a/folly/test/SpookyHashV2Test.cpp +++ b/folly/test/SpookyHashV2Test.cpp @@ -22,6 +22,7 @@ #include #include +#include #include #include @@ -30,8 +31,6 @@ #include #include -#include - using namespace ::folly::hash; static bool failed = false; diff --git a/folly/test/StringTest.cpp b/folly/test/StringTest.cpp index a736fbbe..e1fd686b 100644 --- a/folly/test/StringTest.cpp +++ b/folly/test/StringTest.cpp @@ -23,9 +23,9 @@ #include #include -#include #include +#include using namespace folly; using namespace std; diff --git a/folly/test/SubprocessTest.cpp b/folly/test/SubprocessTest.cpp index 912b05b7..66b18319 100644 --- a/folly/test/SubprocessTest.cpp +++ b/folly/test/SubprocessTest.cpp @@ -20,7 +20,6 @@ #include #include -#include #include #include @@ -31,6 +30,7 @@ #include #include #include +#include #include using namespace folly; diff --git a/folly/test/SynchronizedTest.cpp b/folly/test/SynchronizedTest.cpp index 4aaeadab..adbac419 100644 --- a/folly/test/SynchronizedTest.cpp +++ b/folly/test/SynchronizedTest.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include using namespace folly::sync_tests; diff --git a/folly/test/SynchronizedTestLib-inl.h b/folly/test/SynchronizedTestLib-inl.h index faf60f7c..3bb89c4f 100644 --- a/folly/test/SynchronizedTestLib-inl.h +++ b/folly/test/SynchronizedTestLib-inl.h @@ -16,11 +16,10 @@ #pragma once -#include - #include #include #include +#include #include #include #include diff --git a/folly/test/TestUtils.h b/folly/test/TestUtils.h index 2750f6d0..f40885fd 100644 --- a/folly/test/TestUtils.h +++ b/folly/test/TestUtils.h @@ -18,7 +18,7 @@ #include -#include +#include // We use this to indicate that tests have failed because of timing // or dependencies that may be flakey. Internally this is used by diff --git a/folly/test/ThreadCachedArenaTest.cpp b/folly/test/ThreadCachedArenaTest.cpp index 9332c739..8b6a1a7a 100644 --- a/folly/test/ThreadCachedArenaTest.cpp +++ b/folly/test/ThreadCachedArenaTest.cpp @@ -26,11 +26,11 @@ #include #include -#include #include #include #include +#include using namespace folly; diff --git a/folly/test/ThreadCachedIntTest.cpp b/folly/test/ThreadCachedIntTest.cpp index 4f5c377e..74f6c4dc 100644 --- a/folly/test/ThreadCachedIntTest.cpp +++ b/folly/test/ThreadCachedIntTest.cpp @@ -20,11 +20,11 @@ #include #include -#include #include #include #include +#include using namespace folly; diff --git a/folly/test/ThreadLocalTest.cpp b/folly/test/ThreadLocalTest.cpp index e2e2fce0..c3a276d2 100644 --- a/folly/test/ThreadLocalTest.cpp +++ b/folly/test/ThreadLocalTest.cpp @@ -35,11 +35,11 @@ #include #include -#include #include #include #include +#include #include using namespace folly; diff --git a/folly/test/ThreadNameTest.cpp b/folly/test/ThreadNameTest.cpp index b4618c37..dd6daca3 100644 --- a/folly/test/ThreadNameTest.cpp +++ b/folly/test/ThreadNameTest.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include using namespace std; using namespace folly; diff --git a/folly/test/TimeoutQueueTest.cpp b/folly/test/TimeoutQueueTest.cpp index 581bf0d7..2ac750df 100644 --- a/folly/test/TimeoutQueueTest.cpp +++ b/folly/test/TimeoutQueueTest.cpp @@ -14,9 +14,10 @@ * limitations under the License. */ -#include #include +#include + using namespace folly; TEST(TimeoutQueue, Simple) { diff --git a/folly/test/TimeseriesHistogramTest.cpp b/folly/test/TimeseriesHistogramTest.cpp index 3cb5ce8b..b672866f 100644 --- a/folly/test/TimeseriesHistogramTest.cpp +++ b/folly/test/TimeseriesHistogramTest.cpp @@ -19,7 +19,7 @@ #include -#include +#include using namespace std; using namespace folly; diff --git a/folly/test/TimeseriesTest.cpp b/folly/test/TimeseriesTest.cpp index 91b2c9ee..69b23845 100644 --- a/folly/test/TimeseriesTest.cpp +++ b/folly/test/TimeseriesTest.cpp @@ -22,9 +22,9 @@ #include #include -#include #include +#include using std::chrono::seconds; using std::string; diff --git a/folly/test/TokenBucketTest.cpp b/folly/test/TokenBucketTest.cpp index 7f0f4953..63233782 100644 --- a/folly/test/TokenBucketTest.cpp +++ b/folly/test/TokenBucketTest.cpp @@ -16,7 +16,7 @@ #include -#include +#include using namespace folly; diff --git a/folly/test/TokenBucketTest.h b/folly/test/TokenBucketTest.h index 652d5327..8fc03151 100644 --- a/folly/test/TokenBucketTest.h +++ b/folly/test/TokenBucketTest.h @@ -16,9 +16,8 @@ #pragma once -#include - #include +#include namespace folly { diff --git a/folly/test/TraitsTest.cpp b/folly/test/TraitsTest.cpp index 71b6a176..a5f1a052 100644 --- a/folly/test/TraitsTest.cpp +++ b/folly/test/TraitsTest.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include using namespace folly; using namespace std; diff --git a/folly/test/TryTest.cpp b/folly/test/TryTest.cpp index e1f2c4e9..e9b600a3 100644 --- a/folly/test/TryTest.cpp +++ b/folly/test/TryTest.cpp @@ -14,10 +14,9 @@ * limitations under the License. */ -#include - #include #include +#include using namespace folly; diff --git a/folly/test/UnitTest.cpp b/folly/test/UnitTest.cpp index 18ff4ab5..4bfbf826 100644 --- a/folly/test/UnitTest.cpp +++ b/folly/test/UnitTest.cpp @@ -14,10 +14,10 @@ * limitations under the License. */ -#include - #include +#include + using namespace folly; TEST(Unit, operatorEq) { diff --git a/folly/test/UriTest.cpp b/folly/test/UriTest.cpp index 8d80bbb6..cd1e8e4f 100644 --- a/folly/test/UriTest.cpp +++ b/folly/test/UriTest.cpp @@ -16,10 +16,10 @@ #include #include +#include #include #include -#include #include using namespace folly; diff --git a/folly/test/VarintTest.cpp b/folly/test/VarintTest.cpp index e5dd0e6a..647ab73a 100644 --- a/folly/test/VarintTest.cpp +++ b/folly/test/VarintTest.cpp @@ -22,10 +22,10 @@ #include #include -#include #include #include +#include DEFINE_int32(random_seed, folly::randomNumberSeed(), "random seed"); diff --git a/folly/test/common/TestMain.cpp b/folly/test/common/TestMain.cpp index c8e08d8a..acb53de3 100644 --- a/folly/test/common/TestMain.cpp +++ b/folly/test/common/TestMain.cpp @@ -16,7 +16,7 @@ #include -#include +#include /* * This is the recommended main function for all tests. diff --git a/folly/test/small_vector_test.cpp b/folly/test/small_vector_test.cpp index a7e21166..6215fd73 100644 --- a/folly/test/small_vector_test.cpp +++ b/folly/test/small_vector_test.cpp @@ -25,9 +25,9 @@ #include #include -#include #include +#include #include using folly::small_vector; diff --git a/folly/test/sorted_vector_test.cpp b/folly/test/sorted_vector_test.cpp index 19a52034..5d0dbb15 100644 --- a/folly/test/sorted_vector_test.cpp +++ b/folly/test/sorted_vector_test.cpp @@ -15,10 +15,12 @@ */ #include -#include + #include #include +#include + using folly::sorted_vector_set; using folly::sorted_vector_map; diff --git a/folly/test/stl_tests/StlVectorTest.cpp b/folly/test/stl_tests/StlVectorTest.cpp index 685ad406..022d5fb3 100644 --- a/folly/test/stl_tests/StlVectorTest.cpp +++ b/folly/test/stl_tests/StlVectorTest.cpp @@ -181,13 +181,13 @@ THOUGHTS: #include #include -#include #include #include #include #include #include +#include using namespace std; using namespace folly; -- 2.34.1