folly: remove unused includes

Summary:
Found with our include analysis tool.

I had to tweak `portability/Environment.h` to avoid a false positive breaking win32.

Reviewed By: yfeldblum, Orvid

Differential Revision: D4452463

fbshipit-source-id: e2e862e204892037ddde8815218e4deab1bfbb06

diff --git a/folly/experimental/io/HugePageUtil.cpp b/folly/experimental/io/HugePageUtil.cpp
index c1ec7e13e78160f87e23c9fb2db07e3183a1ae02..a09c1297a07198bfb5fd35d546c72effda6f2205 100644 (file)
--- a/folly/experimental/io/HugePageUtil.cpp
+++ b/folly/experimental/io/HugePageUtil.cpp
@@ -17,11 +17,9 @@
 #include <iostream>
 #include <stdexcept>
 
-#include <folly/File.h>
 #include <folly/Format.h>
 #include <folly/MemoryMapping.h>
 #include <folly/Range.h>
-#include <folly/ScopeGuard.h>
 #include <folly/experimental/io/HugePages.h>
 #include <folly/portability/GFlags.h>
 

diff --git a/folly/experimental/io/HugePages.cpp b/folly/experimental/io/HugePages.cpp
index baa80f5298101c832643059bb70c9ff6a6ab34bf..0733d3a968afb53516642f716e2d4198c0253d5f 100644 (file)
--- a/folly/experimental/io/HugePages.cpp
+++ b/folly/experimental/io/HugePages.cpp
@@ -27,15 +27,11 @@
 #include <stdexcept>
 #include <system_error>
 
-#include <boost/noncopyable.hpp>
 #include <boost/regex.hpp>
 
-#include <glog/logging.h>
-
 #include <folly/Conv.h>
 #include <folly/Format.h>
 #include <folly/Range.h>
-#include <folly/ScopeGuard.h>
 #include <folly/String.h>
 
 #include <folly/gen/Base.h>

diff --git a/folly/experimental/symbolizer/SignalHandler.cpp b/folly/experimental/symbolizer/SignalHandler.cpp
index 5ce2a45ed6125286549f33d43d6dcaf106bc4548..b1837f4044fdb69db7cc8fb6086543472e87109a 100644 (file)
--- a/folly/experimental/symbolizer/SignalHandler.cpp
+++ b/folly/experimental/symbolizer/SignalHandler.cpp
@@ -32,8 +32,6 @@
 #include <glog/logging.h>
 
 #include <folly/Conv.h>
-#include <folly/FileUtil.h>
-#include <folly/Portability.h>
 #include <folly/ScopeGuard.h>
 #include <folly/experimental/symbolizer/ElfCache.h>
 #include <folly/experimental/symbolizer/Symbolizer.h>

diff --git a/folly/experimental/test/LockFreeRingBufferTest.cpp b/folly/experimental/test/LockFreeRingBufferTest.cpp
index 4ee1ff04aa62fedd04b0fd8794d4478be0b652d5..dd1567fd7790b4b2b13aea8d037a0faf17a7fcc7 100644 (file)
--- a/folly/experimental/test/LockFreeRingBufferTest.cpp
+++ b/folly/experimental/test/LockFreeRingBufferTest.cpp
@@ -17,7 +17,6 @@
 #include <iostream>
 #include <thread>
 
-#include <folly/detail/Futex.h>
 #include <folly/experimental/LockFreeRingBuffer.h>
 #include <folly/test/DeterministicSchedule.h>
 #include <folly/portability/GTest.h>

diff --git a/folly/experimental/test/TestUtilTest.cpp b/folly/experimental/test/TestUtilTest.cpp
index 7e002ae331d4d36837cf313f3656dc2d0535f13b..acf9a1f4a25756cd12821ac9e8636dcc3384bf31 100644 (file)
--- a/folly/experimental/test/TestUtilTest.cpp
+++ b/folly/experimental/test/TestUtilTest.cpp
@@ -16,8 +16,6 @@
 
 #include <folly/experimental/TestUtil.h>
 
-#include <sys/types.h>
-
 #include <system_error>
 
 #include <boost/algorithm/string.hpp>

diff --git a/folly/futures/test/TimesTest.cpp b/folly/futures/test/TimesTest.cpp
index 794a01707b5274944c036260ad4e7c1d789cc405..d8464921f50b66cd1a5914021ad92edff443b296 100644 (file)
--- a/folly/futures/test/TimesTest.cpp
+++ b/folly/futures/test/TimesTest.cpp
@@ -18,8 +18,6 @@
 #include <mutex>
 #include <queue>
 
-#include <glog/logging.h>
-
 #include <folly/futures/Future.h>
 #include <folly/futures/Promise.h>
 #include <folly/portability/GTest.h>

diff --git a/folly/futures/test/WhenTest.cpp b/folly/futures/test/WhenTest.cpp
index 9d06e44bac824db460a3bdd95ee3122cbbd8fc62..3d6bdc84b85ea4e20abdfbc3ea36555f674e58de 100644 (file)
--- a/folly/futures/test/WhenTest.cpp
+++ b/folly/futures/test/WhenTest.cpp
@@ -17,10 +17,7 @@
 #include <memory>
 #include <mutex>
 
-#include <glog/logging.h>
-
 #include <folly/futures/Future.h>
-#include <folly/futures/Promise.h>
 #include <folly/portability/GTest.h>
 
 using namespace folly;

diff --git a/folly/futures/test/WhileDoTest.cpp b/folly/futures/test/WhileDoTest.cpp
index 6d811479a8b26c58300274a2110f2f7e821bcdcd..b23770a50b0e13528afd6106d33f4b299e18f4c1 100644 (file)
--- a/folly/futures/test/WhileDoTest.cpp
+++ b/folly/futures/test/WhileDoTest.cpp
@@ -18,8 +18,6 @@
 #include <mutex>
 #include <queue>
 
-#include <glog/logging.h>
-
 #include <folly/futures/Future.h>
 #include <folly/futures/Promise.h>
 #include <folly/portability/GTest.h>

diff --git a/folly/gen/test/CombineTest.cpp b/folly/gen/test/CombineTest.cpp
index c0c32c829e60e654e5f10d13ca6f507be379122a..42c904051cb88ee073e1e5f5c2601a1d5099e399 100644 (file)
--- a/folly/gen/test/CombineTest.cpp
+++ b/folly/gen/test/CombineTest.cpp
@@ -19,7 +19,6 @@
 
 #include <folly/Range.h>
 #include <folly/FBVector.h>
-#include <folly/experimental/TestUtil.h>
 #include <folly/gen/Base.h>
 #include <folly/gen/Combine.h>
 #include <folly/portability/GTest.h>

diff --git a/folly/gen/test/StringTest.cpp b/folly/gen/test/StringTest.cpp
index 82239479a2a662c992821c727fe68e2f8cd93144..b417e3f10503ece3bcd5a6b1ca4ebb92f5280d87 100644 (file)
--- a/folly/gen/test/StringTest.cpp
+++ b/folly/gen/test/StringTest.cpp
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-#include <glog/logging.h>
-
 #include <iosfwd>
 #include <map>
 #include <vector>

diff --git a/folly/io/ShutdownSocketSet.cpp b/folly/io/ShutdownSocketSet.cpp
index 87ecbf2e7e5823b927cb3f2e74463a57030ef283..138091c3362a7ce0fb41865b814ca8f2b300d190 100644 (file)
--- a/folly/io/ShutdownSocketSet.cpp
+++ b/folly/io/ShutdownSocketSet.cpp
@@ -22,7 +22,6 @@
 #include <glog/logging.h>
 
 #include <folly/FileUtil.h>
-#include <folly/Malloc.h>
 #include <folly/portability/Sockets.h>
 
 namespace folly {

diff --git a/folly/io/async/ScopedEventBaseThread.cpp b/folly/io/async/ScopedEventBaseThread.cpp
index a8049462913c14d425ae12fe86e7d696a8709b8d..25f0cba757bc59b6f735f734c44e1cc1e4792d06 100644 (file)
--- a/folly/io/async/ScopedEventBaseThread.cpp
+++ b/folly/io/async/ScopedEventBaseThread.cpp
@@ -19,7 +19,6 @@
 #include <thread>
 
 #include <folly/Function.h>
-#include <folly/Memory.h>
 #include <folly/io/async/EventBaseManager.h>
 
 using namespace std;

diff --git a/folly/io/async/test/AsyncSSLSocketWriteTest.cpp b/folly/io/async/test/AsyncSSLSocketWriteTest.cpp
index 71dd5084c4d0af8848e0c2241db4967081fc11d2..d47af702d428a17bc9e265630f17c267c343945b 100644 (file)
--- a/folly/io/async/test/AsyncSSLSocketWriteTest.cpp
+++ b/folly/io/async/test/AsyncSSLSocketWriteTest.cpp
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <folly/Foreach.h>
 #include <folly/io/Cursor.h>
 #include <folly/io/async/AsyncSSLSocket.h>
 #include <folly/io/async/AsyncSocket.h>

diff --git a/folly/json.cpp b/folly/json.cpp
index 4449e7799d147c04dd905728ca3d538752abad40..f101a7b59e20c1489a485e8641a4fd604f09f4ff 100644 (file)
--- a/folly/json.cpp
+++ b/folly/json.cpp
@@ -24,7 +24,6 @@
 #include <boost/algorithm/string.hpp>
 
 #include <folly/Conv.h>
-#include <folly/Portability.h>
 #include <folly/Range.h>
 #include <folly/String.h>
 #include <folly/Unicode.h>

diff --git a/folly/portability/Environment.h b/folly/portability/Environment.h
index d69cad5c47675a7d5647a753da7d850b111aa54f..ae8dc61c4f714852ac6016da44f457b949ac49cd 100755 (executable)
--- a/folly/portability/Environment.h
+++ b/folly/portability/Environment.h
@@ -21,8 +21,7 @@
 extern "C" {
 #ifndef _WIN32
 extern char** environ;
-#else
+#endif
 int setenv(const char* name, const char* value, int overwrite);
 int unsetenv(const char* name);
-#endif
 }

diff --git a/folly/test/AtomicHashMapTest.cpp b/folly/test/AtomicHashMapTest.cpp
index 993784114c7ccc10555d645a86163cb15b470546..6fb8d84f2d91fb6fc7e44d91054e95245427d63c 100644 (file)
--- a/folly/test/AtomicHashMapTest.cpp
+++ b/folly/test/AtomicHashMapTest.cpp
@@ -21,7 +21,6 @@
 #include <atomic>
 #include <memory>
 
-#include <folly/Assume.h>
 #include <folly/Benchmark.h>
 #include <folly/Conv.h>
 #include <folly/portability/GTest.h>

diff --git a/folly/test/ExceptionTest.cpp b/folly/test/ExceptionTest.cpp
index 0a8268bb8fd07583efdbbccd8acff11356479a1a..eb7965039412de93b83fa0877f1d09b1a6ecbae4 100644 (file)
--- a/folly/test/ExceptionTest.cpp
+++ b/folly/test/ExceptionTest.cpp
@@ -22,8 +22,6 @@
 #include <cstdio>
 #include <memory>
 
-#include <glog/logging.h>
-
 namespace folly { namespace test {
 
 #define EXPECT_SYSTEM_ERROR(statement, err, msg) \

diff --git a/folly/test/FBStringBenchmark.cpp b/folly/test/FBStringBenchmark.cpp
index b8f019f72aed0051d18f3ba2312b2a3cafb953e6..f50a2894643d15473a0ac8a0b8475d80b1ed426e 100644 (file)
--- a/folly/test/FBStringBenchmark.cpp
+++ b/folly/test/FBStringBenchmark.cpp
@@ -24,7 +24,6 @@
 #include <fstream>
 #include <sstream>
 
-#include <boost/algorithm/string.hpp>
 #include <boost/random.hpp>
 
 #include <folly/Benchmark.h>

diff --git a/folly/test/RandomBenchmark.cpp b/folly/test/RandomBenchmark.cpp
index 68428301870e17c14c57f47c7d5d15a33c89a231..287482e5f3b9c71665fd96c05d962eea16aa6bbc 100644 (file)
--- a/folly/test/RandomBenchmark.cpp
+++ b/folly/test/RandomBenchmark.cpp
@@ -18,7 +18,6 @@
 
 #include <folly/Benchmark.h>
 #include <folly/Foreach.h>
-#include <folly/Range.h>
 
 #include <glog/logging.h>
 

diff --git a/folly/test/SharedMutexTest.cpp b/folly/test/SharedMutexTest.cpp
index 120dc595722b784a548622c0d6eed396f60b9951..d18e3b6e263592fa87ce91801b898c74ba71877d 100644 (file)
--- a/folly/test/SharedMutexTest.cpp
+++ b/folly/test/SharedMutexTest.cpp
@@ -26,7 +26,6 @@
 #include <folly/Benchmark.h>
 #include <folly/MPMCQueue.h>
 #include <folly/RWSpinLock.h>
-#include <folly/Random.h>
 #include <folly/portability/GFlags.h>
 #include <folly/portability/GTest.h>
 #include <folly/test/DeterministicSchedule.h>

diff --git a/folly/test/ThreadCachedArenaTest.cpp b/folly/test/ThreadCachedArenaTest.cpp
index f9076fceeed59cc12772381a683bc565bfc442b0..ea978dc1e8216548f178bc4cbc050bf766ffe9f8 100644 (file)
--- a/folly/test/ThreadCachedArenaTest.cpp
+++ b/folly/test/ThreadCachedArenaTest.cpp
@@ -29,7 +29,6 @@
 
 #include <folly/Range.h>
 #include <folly/Benchmark.h>
-#include <folly/Portability.h>
 #include <folly/portability/GTest.h>
 
 using namespace folly;