Fix #includes

Summary:
A few of folly's includes do not start with folly/, and so were
missed by D1411225's include-quotation ##""## -> ##<>## transformation change.
There were also some folly includes in deeper folly directories and the
docs, which I also fixed.

The search ##egrep "# *include *\"" -R folly/*## now only includes two
lines in FBString.h, which are included for libgcc purposes.

The wangle/test/Thens.cpp file, which is auto-generated, was special.
I changed the generator .rb script, but when I ran it I overwrote some
manual changes to Thens.cpp. For simplicity, I have manually applied the
change to Thens.cpp as well.

Test Plan: fbconfig -r folly && fbmake runtests

Reviewed By: hannesr@fb.com

Subscribers: sdwilsh, fugalh

FB internal diff: D1511712

diff --git a/folly/AtomicHashArray.h b/folly/AtomicHashArray.h
index 043909c0f067379358323d22dc20cdd57eb6f632..18e883a465402ab8b41d85db761477f4f1d570b1 100644 (file)
--- a/folly/AtomicHashArray.h
+++ b/folly/AtomicHashArray.h
@@ -296,6 +296,6 @@ class AtomicHashArray : boost::noncopyable {
 
 } // namespace folly
 
-#include "AtomicHashArray-inl.h"
+#include <folly/AtomicHashArray-inl.h>
 
 #endif // FOLLY_ATOMICHASHARRAY_H_

diff --git a/folly/AtomicHashMap.h b/folly/AtomicHashMap.h
index 21c52f0e00222731a0b3b9063d90a59e0c407b39..f1fd787ad46b69a973595a4102d0cd028f20d0dc 100644 (file)
--- a/folly/AtomicHashMap.h
+++ b/folly/AtomicHashMap.h
@@ -410,6 +410,6 @@ class AtomicHashMap : boost::noncopyable {
 
 } // namespace folly
 
-#include "AtomicHashMap-inl.h"
+#include <folly/AtomicHashMap-inl.h>
 
 #endif // FOLLY_ATOMICHASHMAP_H_

diff --git a/folly/Benchmark.cpp b/folly/Benchmark.cpp
index 6259970872fe7ad26370672be7b2d95cb3546359..940fe91c27e81bdba1fd883fff220ef9b4c77b27 100644 (file)
--- a/folly/Benchmark.cpp
+++ b/folly/Benchmark.cpp
@@ -16,10 +16,10 @@
 
 // @author Andrei Alexandrescu (andrei.alexandrescu@fb.com)
 
-#include "Benchmark.h"
-#include "Foreach.h"
-#include "json.h"
-#include "String.h"
+#include <folly/Benchmark.h>
+#include <folly/Foreach.h>
+#include <folly/json.h>
+#include <folly/String.h>
 
 #include <algorithm>
 #include <boost/regex.hpp>

diff --git a/folly/IPAddress.cpp b/folly/IPAddress.cpp
index e59caf3b36ac8fa10b989a9fc03d0ee04d54257f..0a92d3cbaa6260e5bc7caa2647f49de69608e6ec 100644 (file)
--- a/folly/IPAddress.cpp
+++ b/folly/IPAddress.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "IPAddress.h"
+#include <folly/IPAddress.h>
 
 #include <limits>
 #include <ostream>

diff --git a/folly/IPAddressV4.cpp b/folly/IPAddressV4.cpp
index ae403eb4285f664d4483cf812a05b42d79e7d21c..144e4cce6d006b204ce95d52fddfd14f0682c9e5 100644 (file)
--- a/folly/IPAddressV4.cpp
+++ b/folly/IPAddressV4.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "IPAddressV4.h"
+#include <folly/IPAddressV4.h>
 
 #include <ostream>
 #include <string>

diff --git a/folly/IPAddressV6.cpp b/folly/IPAddressV6.cpp
index 849c6d63be6fe57eda3922dbd9ce2c6dd977aadc..ea07bb8d5516b8c3d00d5de54c86f6483207a920 100644 (file)
--- a/folly/IPAddressV6.cpp
+++ b/folly/IPAddressV6.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "IPAddressV6.h"
+#include <folly/IPAddressV6.h>
 
 #include <ostream>
 #include <string>

diff --git a/folly/LifoSem.cpp b/folly/LifoSem.cpp
index 942f3ffa39bf097df60afeb920877323f7f2cb8d..dd9f3f8d605f20314102b92a7dd34196654f8ade 100644 (file)
--- a/folly/LifoSem.cpp
+++ b/folly/LifoSem.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "LifoSem.h"
+#include <folly/LifoSem.h>
 
 /// Raw node storage is preallocated in a contiguous memory segment,
 /// but we use an anonymous mmap so the physical memory used (RSS) will

diff --git a/folly/MacAddress.cpp b/folly/MacAddress.cpp
index b8aa1afe9447df5732ffbbd5311cd170891e8b8e..1764058eda263d65319f0a09958129fb123a1fc0 100644 (file)
--- a/folly/MacAddress.cpp
+++ b/folly/MacAddress.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "MacAddress.h"
+#include <folly/MacAddress.h>
 
 #include <folly/Exception.h>
 #include <folly/IPAddressV6.h>

diff --git a/folly/Portability.h b/folly/Portability.h
index 6ce3d51dfb67c7def26d835e1e928267003d6d8c..4cfec56c0a3dd6feb7a7762272a87a47510441ad 100644 (file)
--- a/folly/Portability.h
+++ b/folly/Portability.h
@@ -18,7 +18,7 @@
 #define FOLLY_PORTABILITY_H_
 
 #ifndef FOLLY_NO_CONFIG
-#include "folly-config.h"
+#include <folly/folly-config.h>
 #endif
 
 #ifdef FOLLY_PLATFORM_CONFIG
@@ -29,7 +29,7 @@
 #include <features.h>
 #endif
 
-#include "CPortability.h"
+#include <folly/CPortability.h>
 
 #if FOLLY_HAVE_SCHED_H
  #include <sched.h>

diff --git a/folly/ThreadName.h b/folly/ThreadName.h
index 2d30efa0af94f1ede599bf0b19d8fe546eaf944d..dbcdc84ed2ed55f8b67677f957e46d3d21b9d426 100644 (file)
--- a/folly/ThreadName.h
+++ b/folly/ThreadName.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #include <pthread.h>
-#include "Range.h"
+#include <folly/Range.h>
 
 namespace folly {
 

diff --git a/folly/detail/MemoryIdler.cpp b/folly/detail/MemoryIdler.cpp
index fdda4ca98da3a3d87e6f01d16021b7e452c51ca5..de585f2d2b996e11f01bb60176293156571acc45 100644 (file)
--- a/folly/detail/MemoryIdler.cpp
+++ b/folly/detail/MemoryIdler.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "MemoryIdler.h"
+#include <folly/detail/MemoryIdler.h>
 #include <folly/Logging.h>
 #include <folly/Malloc.h>
 #include <folly/ScopeGuard.h>

diff --git a/folly/detail/MemoryIdler.h b/folly/detail/MemoryIdler.h
index 5898b07f5d6ddd4ea5166c9677764043356a5a4f..28d3c196420d41b023de8bf833ff92c85523be6a 100644 (file)
--- a/folly/detail/MemoryIdler.h
+++ b/folly/detail/MemoryIdler.h
@@ -22,7 +22,7 @@
 #include <folly/AtomicStruct.h>
 #include <folly/Hash.h>
 #include <folly/Traits.h>
-#include "Futex.h"
+#include <folly/detail/Futex.h>
 
 namespace folly {
 

diff --git a/folly/docs/Benchmark.md b/folly/docs/Benchmark.md
index c1be39fbe3d6d3eef00342e96c72abcc1ee0d58d..2d5c494904f7b9f26d861c12b4e550d6899e7403 100644 (file)
--- a/folly/docs/Benchmark.md
+++ b/folly/docs/Benchmark.md
@@ -16,8 +16,8 @@ build (either directly or packaged with a library).
 Using `folly/Benchmark.h` is very simple. Here's an example:
 
 ``` Cpp
-    #include "folly/Benchmark.h"
-    #include "folly/Foreach.h"
+    #include <folly/Benchmark.h>
+    #include <folly/Foreach.h>
     #include <vector>
     using namespace std;
     using namespace folly;
@@ -70,8 +70,8 @@ passed by the framework down to the function. The type of the count is
 implicitly `unsigned`. Consider a slightly reworked example:
 
 ``` Cpp
-    #include "folly/Benchmark.h"
-    #include "folly/Foreach.h"
+    #include <folly/Benchmark.h>
+    #include <folly/Foreach.h>
     #include <vector>
     using namespace std;
     using namespace folly;
@@ -126,8 +126,8 @@ front insertion for a vector as a baseline and see how back insertion
 compares with it:
 
 ``` Cpp
-    #include "folly/Benchmark.h"
-    #include "folly/Foreach.h"
+    #include <folly/Benchmark.h>
+    #include <folly/Foreach.h>
     #include <vector>
     using namespace std;
     using namespace folly;

diff --git a/folly/docs/Overview.md b/folly/docs/Overview.md
index db12cf3c94f33b23a02326671ae9e43db04ee06b..5cbf3e78d027c05a848dc4a002fb04164896fb86 100644 (file)
--- a/folly/docs/Overview.md
+++ b/folly/docs/Overview.md
@@ -33,7 +33,7 @@ At the top level Folly uses the classic "stuttering" scheme
 `folly/folly` used by Boost and others. The first directory serves as
 an installation root of the library (with possible versioning a la
 `folly-1.0/`), and the second is to distinguish the library when
-including files, e.g. `#include "folly/FBString.h"`.
+including files, e.g. `#include <folly/FBString.h>`.
 
 The directory structure is flat (mimicking the namespace structure),
 i.e. we don't have an elaborate directory hierarchy (it is possible

diff --git a/folly/small_vector.h b/folly/small_vector.h
index 1a8c542b33d83431c67645f9aab3aed2fceddad0..92a5a2fc29d3b1561476273f2377e8e51fcf2370 100644 (file)
--- a/folly/small_vector.h
+++ b/folly/small_vector.h
@@ -23,7 +23,7 @@
 #ifndef FOLLY_SMALL_VECTOR_H_
 #define FOLLY_SMALL_VECTOR_H_
 
-#include "Portability.h"
+#include <folly/Portability.h>
 
 #include <stdexcept>
 #include <cstdlib>
@@ -49,7 +49,7 @@
 #include <folly/Malloc.h>
 
 #if defined(__GNUC__) && FOLLY_X64
-# include "folly/SmallLocks.h"
+# include <folly/SmallLocks.h>
 # define FB_PACK_ATTR FOLLY_PACK_ATTR
 # define FB_PACK_PUSH FOLLY_PACK_PUSH
 # define FB_PACK_POP FOLLY_PACK_POP

diff --git a/folly/test/DeterministicSchedule.cpp b/folly/test/DeterministicSchedule.cpp
index f4c355e065d0101c91ada7b2e7e0a8d96195c7ba..8a3b1fc15248a4e126c3b5f09dbde36d840d135d 100644 (file)
--- a/folly/test/DeterministicSchedule.cpp
+++ b/folly/test/DeterministicSchedule.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "DeterministicSchedule.h"
+#include <folly/test/DeterministicSchedule.h>
 #include <algorithm>
 #include <list>
 #include <mutex>

diff --git a/folly/test/DeterministicScheduleTest.cpp b/folly/test/DeterministicScheduleTest.cpp
index 6ec429fb7e8a3884f22fdf1ad7a99beef0554837..2d364310a5fc5be67ed8e459535b2853d905b1e4 100644 (file)
--- a/folly/test/DeterministicScheduleTest.cpp
+++ b/folly/test/DeterministicScheduleTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "DeterministicSchedule.h"
+#include <folly/test/DeterministicSchedule.h>
 
 #include <gflags/gflags.h>
 #include <gtest/gtest.h>

diff --git a/folly/test/IPAddressTest.cpp b/folly/test/IPAddressTest.cpp
index bdda3663d3a8e75d89e5d3d39146a505874b355c..7b7be99549d28dde5cb1bc47ada830d77c4f586f 100644 (file)
--- a/folly/test/IPAddressTest.cpp
+++ b/folly/test/IPAddressTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "IPAddressTest.h"
+#include <folly/test/IPAddressTest.h>
 
 #include <gtest/gtest.h>
 

diff --git a/folly/wangle/Future-inl.h b/folly/wangle/Future-inl.h
index 3783126e8b72d624776556363def5863d4739f1c..782afe4b01bdc27cd099e4f55bbaa9236f3f86aa 100644 (file)
--- a/folly/wangle/Future-inl.h
+++ b/folly/wangle/Future-inl.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "detail/State.h"
+#include <folly/wangle/detail/State.h>
 #include <folly/LifoSem.h>
 
 namespace folly { namespace wangle {

diff --git a/folly/wangle/Future.h b/folly/wangle/Future.h
index 0e99bb6ac9c4506d6be31828f0d3564057ea1370..e8ac812129c91915fee22bdaa794fb7b30e51f6c 100644 (file)
--- a/folly/wangle/Future.h
+++ b/folly/wangle/Future.h
@@ -24,8 +24,8 @@
 #include <vector>
 
 #include <folly/MoveWrapper.h>
-#include "Promise.h"
-#include "Try.h"
+#include <folly/wangle/Promise.h>
+#include <folly/wangle/Try.h>
 
 namespace folly { namespace wangle {
 
@@ -339,4 +339,4 @@ Future<T> waitWithSemaphore(Future<T>&& f, Duration timeout);
 
 }} // folly::wangle
 
-#include "Future-inl.h"
+#include <folly/wangle/Future-inl.h>

diff --git a/folly/wangle/GenericThreadGate.h b/folly/wangle/GenericThreadGate.h
index 9ffbb2028da642f85afd6e96eec51472e56a8c79..5388692092076167a99f7a0983a36a5d9a588205 100644 (file)
--- a/folly/wangle/GenericThreadGate.h
+++ b/folly/wangle/GenericThreadGate.h
@@ -15,8 +15,8 @@
  */
 
 #pragma once
-#include "ThreadGate.h"
-#include "Executor.h"
+#include <folly/wangle/ThreadGate.h>
+#include <folly/wangle/Executor.h>
 #include <type_traits>
 
 namespace folly { namespace wangle {

diff --git a/folly/wangle/Later.h b/folly/wangle/Later.h
index 4680aa8d7036957be85cb1344ae5fa18c867db0c..edde49d09c3d6cbfa2112e1015b3e43e65959a92 100644 (file)
--- a/folly/wangle/Later.h
+++ b/folly/wangle/Later.h
@@ -208,4 +208,4 @@ class Later {
 
 }}
 
-#include "Later-inl.h"
+#include <folly/wangle/Later-inl.h>

diff --git a/folly/wangle/ManualExecutor.cpp b/folly/wangle/ManualExecutor.cpp
index 2c0813011ff7e72109b1bd7e57541f1c2947b418..560475ccd5949d9efda64892179e91ff4a455a1a 100644 (file)
--- a/folly/wangle/ManualExecutor.cpp
+++ b/folly/wangle/ManualExecutor.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "ManualExecutor.h"
+#include <folly/wangle/ManualExecutor.h>
 
 #include <string.h>
 #include <string>

diff --git a/folly/wangle/OpaqueCallbackShunt.h b/folly/wangle/OpaqueCallbackShunt.h
index 296cdea1531afab59c12d93823964120fdb0da17..a5aebf8e41bd23b6c6d632d4b44bc2594c24d492 100644 (file)
--- a/folly/wangle/OpaqueCallbackShunt.h
+++ b/folly/wangle/OpaqueCallbackShunt.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "Promise.h"
+#include <folly/wangle/Promise.h>
 
 namespace folly { namespace wangle {
 

diff --git a/folly/wangle/Promise-inl.h b/folly/wangle/Promise-inl.h
index e502796346daa44304a65be4c9b5c1eb33efae1d..04cc9a3f84ca62fb639d7cdeabe864312745a7dd 100644 (file)
--- a/folly/wangle/Promise-inl.h
+++ b/folly/wangle/Promise-inl.h
@@ -19,8 +19,8 @@
 #include <atomic>
 #include <thread>
 
-#include "WangleException.h"
-#include "detail/State.h"
+#include <folly/wangle/WangleException.h>
+#include <folly/wangle/detail/State.h>
 
 namespace folly { namespace wangle {
 

diff --git a/folly/wangle/Promise.h b/folly/wangle/Promise.h
index 62e6f6d83e4fd2287061c5ca9a3305b8e27af045..e14350e37e4fb044c58063d18dee7fe1b041c75f 100644 (file)
--- a/folly/wangle/Promise.h
+++ b/folly/wangle/Promise.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "Try.h"
-#include "Future.h"
+#include <folly/wangle/Try.h>
+#include <folly/wangle/Future.h>
 
 namespace folly { namespace wangle {
 
@@ -91,4 +91,4 @@ private:
 
 }}
 
-#include "Promise-inl.h"
+#include <folly/wangle/Promise-inl.h>

diff --git a/folly/wangle/QueuedImmediateExecutor.cpp b/folly/wangle/QueuedImmediateExecutor.cpp
index 05a3b891ab3207567f453fa43f923e67b73a80b8..469d029643df83b144c98febfddb17ec93db95e0 100644 (file)
--- a/folly/wangle/QueuedImmediateExecutor.cpp
+++ b/folly/wangle/QueuedImmediateExecutor.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "QueuedImmediateExecutor.h"
+#include <folly/wangle/QueuedImmediateExecutor.h>
 #include <folly/ThreadLocal.h>
 #include <queue>
 

diff --git a/folly/wangle/ThreadGate.cpp b/folly/wangle/ThreadGate.cpp
index e27142db06444d4aa730674df9b5baf9f91e2ee2..6a210da2d1feb603244d58719cc47ea68c437b4e 100644 (file)
--- a/folly/wangle/ThreadGate.cpp
+++ b/folly/wangle/ThreadGate.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "ThreadGate.h"
+#include <folly/wangle/ThreadGate.h>
 #include <stdexcept>
 
 namespace folly { namespace wangle {

diff --git a/folly/wangle/ThreadGate.h b/folly/wangle/ThreadGate.h
index d7b5124daeb34964a45baca93a95c499b20758ec..bed9d9aa6a6259a4a89c2fb70931303695c2db06 100644 (file)
--- a/folly/wangle/ThreadGate.h
+++ b/folly/wangle/ThreadGate.h
@@ -16,7 +16,7 @@
 
 #pragma once
 #include <memory>
-#include "Future.h"
+#include <folly/wangle/Future.h>
 
 namespace folly { namespace wangle {
 

diff --git a/folly/wangle/Try-inl.h b/folly/wangle/Try-inl.h
index bb3257d6a15e855b90e08007f3f211f4225a7dc2..935f54bce8313718fc8927802c24ed28ab8fc6e4 100644 (file)
--- a/folly/wangle/Try-inl.h
+++ b/folly/wangle/Try-inl.h
@@ -18,7 +18,7 @@
 
 #include <stdexcept>
 
-#include "WangleException.h"
+#include <folly/wangle/WangleException.h>
 
 namespace folly { namespace wangle {
 

diff --git a/folly/wangle/Try.h b/folly/wangle/Try.h
index d61b4c13e90fa38685f2878e32e8c29ee2b7a342..d13fffb58d96992f1d56e68f7b8c3763bc5724d3 100644 (file)
--- a/folly/wangle/Try.h
+++ b/folly/wangle/Try.h
@@ -121,4 +121,4 @@ makeTryFunction(F&& f);
 
 }}
 
-#include "Try-inl.h"
+#include <folly/wangle/Try-inl.h>

diff --git a/folly/wangle/test/Thens.cpp b/folly/wangle/test/Thens.cpp
index e733922102270556670b3d0dc03f45edc95fff61..268d36b20700c6059e9cafd1dc50343a7098d22d 100644 (file)
--- a/folly/wangle/test/Thens.cpp
+++ b/folly/wangle/test/Thens.cpp
@@ -1,6 +1,6 @@
 // This file is @generated by thens.rb
 
-#include "Thens.h"
+#include <folly/wangle/test/Thens.h>
 
 #ifndef __clang__
 // TODO: fails to compile with clang:dev.  See task #4412111

diff --git a/folly/wangle/test/thens.rb b/folly/wangle/test/thens.rb
index 2f07353000c3cc6e6555f0a8c440bb57965b604a..942096c3020558d8209388db0d55fb2b5152d1ee 100755 (executable)
--- a/folly/wangle/test/thens.rb
+++ b/folly/wangle/test/thens.rb
@@ -61,7 +61,7 @@ tests = (
 print <<EOF
 // This file is #{"@"}generated by thens.rb
 
-#include "Thens.h"
+#include <folly/wangle/test/Thens.h>
 
 TEST(Future, thenVariants) {
   SomeClass anObject;