Deshim //folly:dynamic to //folly/json:dynamic in folly

Summary: The following headers were shimmed in //folly:dynamic and were modded: - folly/DynamicConverter.h -> folly/json/DynamicConverter.h - folly/dynamic.h -> folly/json/dynamic.h - folly/dynamic-inl.h -> folly/json/dynamic-inl.h - folly/json.h -> folly/json/json.h `arc lint` was applied Reviewed By: Orvid Differential Revision: D53837111 fbshipit-source-id: ef2a1c422c21c62bcd67b5f3eada91ad106eea72
facebook · Feb 20, 2024 · b1c5c74 · b1c5c74
1 parent a951ff7
commit b1c5c74
Show file tree

Hide file tree

Showing 32 changed files with 39 additions and 39 deletions.
diff --git a/folly/Benchmark.cpp b/folly/Benchmark.cpp
@@ -33,7 +33,7 @@
 #include <folly/MapUtil.h>
 #include <folly/String.h>
 #include <folly/detail/PerfScoped.h>
-#include <folly/json.h>
+#include <folly/json/json.h>
 
 // This needs to be at the end because some versions end up including
 // Windows.h without defining NOMINMAX, which breaks uses

diff --git a/folly/docs/examples/folly/DynamicConverter.cpp b/folly/docs/examples/folly/DynamicConverter.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <vector>
-#include <folly/DynamicConverter.h>
+#include <folly/json/DynamicConverter.h>
 #include <folly/portability/GTest.h>
 
 using namespace folly;

diff --git a/folly/docs/examples/folly/dynamic.cpp b/folly/docs/examples/folly/dynamic.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <folly/dynamic.h>
+#include <folly/json/dynamic.h>
 #include <folly/portability/GTest.h>
 
 using folly::dynamic;

diff --git a/folly/docs/examples/folly/dynamic/array.cpp b/folly/docs/examples/folly/dynamic/array.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <folly/dynamic.h>
+#include <folly/json/dynamic.h>
 #include <folly/portability/GTest.h>
 
 TEST(dynamic, arrayCtor) {

diff --git a/folly/docs/examples/folly/dynamic/object.cpp b/folly/docs/examples/folly/dynamic/object.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <folly/dynamic.h>
+#include <folly/json/dynamic.h>
 #include <folly/portability/GTest.h>
 
 TEST(dynamic, objectCtor) {

diff --git a/folly/experimental/bser/Bser.h b/folly/experimental/bser/Bser.h
@@ -20,9 +20,9 @@
 
 #include <folly/CPortability.h>
 #include <folly/Optional.h>
-#include <folly/dynamic.h>
 #include <folly/io/IOBuf.h>
 #include <folly/io/IOBufQueue.h>
+#include <folly/json/dynamic.h>
 
 /* This is an implementation of the BSER binary serialization scheme.
  * BSER was created as a binary, local-system-only representation of

diff --git a/folly/experimental/tool/JSONSchemaTester.cpp b/folly/experimental/tool/JSONSchemaTester.cpp
@@ -19,7 +19,7 @@
 #include <string>
 
 #include <folly/experimental/JSONSchema.h>
-#include <folly/json.h>
+#include <folly/json/json.h>
 
 /**
  * A binary that supports testing against the official tests from:

diff --git a/folly/futures/test/FutureTest.cpp b/folly/futures/test/FutureTest.cpp
@@ -28,8 +28,8 @@
 #include <folly/Executor.h>
 #include <folly/Memory.h>
 #include <folly/Unit.h>
-#include <folly/dynamic.h>
 #include <folly/executors/ManualExecutor.h>
+#include <folly/json/dynamic.h>
 #include <folly/portability/GTest.h>
 #include <folly/synchronization/Baton.h>
 

diff --git a/folly/futures/test/SemiFutureTest.cpp b/folly/futures/test/SemiFutureTest.cpp
@@ -26,10 +26,10 @@
 #include <folly/Executor.h>
 #include <folly/Memory.h>
 #include <folly/Unit.h>
-#include <folly/dynamic.h>
 #include <folly/executors/ManualExecutor.h>
 #include <folly/futures/Future.h>
 #include <folly/io/async/EventBase.h>
+#include <folly/json/dynamic.h>
 #include <folly/portability/GTest.h>
 #include <folly/synchronization/Baton.h>
 

diff --git a/folly/gen/test/BaseTest.cpp b/folly/gen/test/BaseTest.cpp
@@ -28,8 +28,8 @@
 #include <folly/MapUtil.h>
 #include <folly/Memory.h>
 #include <folly/String.h>
-#include <folly/dynamic.h>
 #include <folly/experimental/TestUtil.h>
+#include <folly/json/dynamic.h>
 #include <folly/portability/GFlags.h>
 #include <folly/portability/GTest.h>
 

diff --git a/folly/json/DynamicParser.h b/folly/json/DynamicParser.h
@@ -18,7 +18,7 @@
 
 #include <folly/CPortability.h>
 #include <folly/ScopeGuard.h>
-#include <folly/dynamic.h>
+#include <folly/json/dynamic.h>
 
 namespace folly {
 

diff --git a/folly/json/JSONSchema.cpp b/folly/json/JSONSchema.cpp
@@ -25,7 +25,7 @@
 #include <folly/Optional.h>
 #include <folly/Singleton.h>
 #include <folly/String.h>
-#include <folly/json.h>
+#include <folly/json/json.h>
 #include <folly/portability/Math.h>
 
 namespace folly {

diff --git a/folly/json/JSONSchema.h b/folly/json/JSONSchema.h
@@ -18,7 +18,7 @@
 
 #include <folly/ExceptionWrapper.h>
 #include <folly/Range.h>
-#include <folly/dynamic.h>
+#include <folly/json/dynamic.h>
 
 /**
  * Validation according to the draft v4 standard: http://json-schema.org/

diff --git a/folly/json/JsonTestUtil.cpp b/folly/json/JsonTestUtil.cpp
@@ -20,7 +20,7 @@
 #include <cmath>
 
 #include <folly/Conv.h>
-#include <folly/json.h>
+#include <folly/json/json.h>
 #include <folly/lang/Assume.h>
 
 namespace folly {

diff --git a/folly/json/JsonTestUtil.h b/folly/json/JsonTestUtil.h
@@ -20,7 +20,7 @@
 #include <string>
 
 #include <folly/Range.h>
-#include <folly/dynamic.h>
+#include <folly/json/dynamic.h>
 
 namespace folly {
 

diff --git a/folly/json/json_patch.h b/folly/json/json_patch.h
@@ -20,7 +20,7 @@
 
 #include <folly/Expected.h>
 #include <folly/Optional.h>
-#include <folly/dynamic.h>
+#include <folly/json/dynamic.h>
 #include <folly/json_pointer.h>
 
 namespace folly {

diff --git a/folly/json/test/DynamicBenchmark.cpp b/folly/json/test/DynamicBenchmark.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <folly/dynamic.h>
+#include <folly/json/dynamic.h>
 
 #include <folly/Benchmark.h>
 #include <folly/init/Init.h>

diff --git a/folly/json/test/DynamicConverterTest.cpp b/folly/json/test/DynamicConverterTest.cpp
@@ -16,7 +16,7 @@
 
 // @author Nicholas Ormrod <[email protected]>
 
-#include <folly/DynamicConverter.h>
+#include <folly/json/DynamicConverter.h>
 
 #include <algorithm>
 #include <map>

diff --git a/folly/json/test/DynamicOtherTest.cpp b/folly/json/test/DynamicOtherTest.cpp
@@ -16,9 +16,9 @@
 
 #include <iostream>
 
-#include <folly/dynamic.h>
 #include <folly/gen/Base.h>
-#include <folly/json.h>
+#include <folly/json/dynamic.h>
+#include <folly/json/json.h>
 #include <folly/portability/GFlags.h>
 #include <folly/portability/GTest.h>
 

diff --git a/folly/json/test/DynamicTest.cpp b/folly/json/test/DynamicTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <folly/dynamic.h>
+#include <folly/json/dynamic.h>
 
 #include <cmath>
 #include <iterator>
@@ -23,7 +23,7 @@
 
 #include <folly/Range.h>
 #include <folly/hash/Hash.h>
-#include <folly/json.h>
+#include <folly/json/json.h>
 #include <folly/portability/GTest.h>
 #include <folly/test/ComparisonOperatorTestUtil.h>
 

diff --git a/folly/json/test/JSONSchemaTest.cpp b/folly/json/test/JSONSchemaTest.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <folly/experimental/JSONSchema.h>
-#include <folly/json.h>
+#include <folly/json/json.h>
 #include <folly/portability/GTest.h>
 
 using folly::dynamic;

diff --git a/folly/json/test/JsonBenchmark.cpp b/folly/json/test/JsonBenchmark.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <folly/json.h>
+#include <folly/json/json.h>
 
 #include <folly/Benchmark.h>
 

diff --git a/folly/json/test/JsonOtherTest.cpp b/folly/json/test/JsonOtherTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <folly/json.h>
+#include <folly/json/json.h>
 #include <folly/portability/GTest.h>
 
 TEST(Json, StripComments) {

diff --git a/folly/json/test/JsonTest.cpp b/folly/json/test/JsonTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <folly/json.h>
+#include <folly/json/json.h>
 
 #include <cstdint>
 #include <iterator>

diff --git a/folly/json/test/json_patch_test.cpp b/folly/json/test/json_patch_test.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <folly/json.h>
+#include <folly/json/json.h>
 #include <folly/json_patch.h>
 #include <folly/json_pointer.h>
 #include <folly/portability/GMock.h>

diff --git a/folly/logging/LogConfigParser.cpp b/folly/logging/LogConfigParser.cpp
@@ -18,8 +18,8 @@
 
 #include <folly/Conv.h>
 #include <folly/String.h>
-#include <folly/dynamic.h>
-#include <folly/json.h>
+#include <folly/json/dynamic.h>
+#include <folly/json/json.h>
 #include <folly/lang/SafeAssert.h>
 #include <folly/logging/LogName.h>
 

diff --git a/folly/logging/test/ConfigParserTest.cpp b/folly/logging/test/ConfigParserTest.cpp
@@ -15,8 +15,8 @@
  */
 
 #include <folly/String.h>
-#include <folly/dynamic.h>
-#include <folly/json.h>
+#include <folly/json/dynamic.h>
+#include <folly/json/json.h>
 #include <folly/logging/LogCategory.h>
 #include <folly/logging/LogConfig.h>
 #include <folly/logging/LogConfigParser.h>

diff --git a/folly/logging/test/ConfigUpdateTest.cpp b/folly/logging/test/ConfigUpdateTest.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <folly/dynamic.h>
-#include <folly/json.h>
+#include <folly/json/dynamic.h>
+#include <folly/json/json.h>
 #include <folly/logging/LogCategory.h>
 #include <folly/logging/LogConfig.h>
 #include <folly/logging/LogConfigParser.h>

diff --git a/folly/support/test/main.cpp b/folly/support/test/main.cpp
@@ -21,7 +21,7 @@
 #include <folly/SocketAddress.h>
 #include <folly/container/F14Map.h>
 #include <folly/container/F14Set.h>
-#include <folly/dynamic.h>
+#include <folly/json/dynamic.h>
 #include <folly/small_vector.h>
 #include <folly/support/test/GdbUtil.h>
 

diff --git a/folly/test/FormatBenchmark.cpp b/folly/test/FormatBenchmark.cpp
@@ -23,9 +23,9 @@
 #include <folly/Benchmark.h>
 #include <folly/FBVector.h>
 #include <folly/Utility.h>
-#include <folly/dynamic.h>
 #include <folly/init/Init.h>
-#include <folly/json.h>
+#include <folly/json/dynamic.h>
+#include <folly/json/json.h>
 
 FOLLY_GNU_DISABLE_WARNING("-Wdeprecated-declarations")
 

diff --git a/folly/test/FormatOtherTest.cpp b/folly/test/FormatOtherTest.cpp
@@ -20,8 +20,8 @@
 #include <folly/FileUtil.h>
 #include <folly/Format.h>
 #include <folly/Portability.h>
-#include <folly/dynamic.h>
-#include <folly/json.h>
+#include <folly/json/dynamic.h>
+#include <folly/json/json.h>
 #include <folly/portability/GFlags.h>
 #include <folly/portability/GTest.h>
 #include <folly/small_vector.h>

diff --git a/folly/tool/BenchmarkCompare.cpp b/folly/tool/BenchmarkCompare.cpp
@@ -17,7 +17,7 @@
 #include <folly/Benchmark.h>
 #include <folly/FileUtil.h>
 #include <folly/init/Init.h>
-#include <folly/json.h>
+#include <folly/json/json.h>
 
 /**
  * Utility to produce a relative benchmark result from JSON result dumps