Move runtime/base/array/* up one level.

Also rename array_inline.h to array_data-inl.h

hphp/compiler/builtin_symbols.cpp

@@ -30,7 +30,7 @@
 #include "hphp/util/parser/hphp.tab.hpp"
 #include "hphp/runtime/base/class_info.h"
 #include "hphp/runtime/base/program_functions.h"
-#include "hphp/runtime/base/array/array_iterator.h"
+#include "hphp/runtime/base/array_iterator.h"
 #include "hphp/runtime/base/execution_context.h"
 #include "hphp/runtime/base/thread_init_fini.h"
 #include "hphp/util/logger.h"

hphp/compiler/expression/expression.cpp

@@ -35,7 +35,7 @@
 #include "hphp/compiler/expression/function_call.h"
 #include "hphp/compiler/analysis/file_scope.h"
 #include "hphp/util/hash.h"
-#include "hphp/runtime/base/array/array_iterator.h"
+#include "hphp/runtime/base/array_iterator.h"
 
 using namespace HPHP;
 

hphp/compiler/expression/expression_list.cpp

@@ -22,7 +22,7 @@
 #include "hphp/compiler/analysis/variable_table.h"
 #include "hphp/compiler/expression/array_pair_expression.h"
 #include "hphp/compiler/analysis/function_scope.h"
-#include "hphp/runtime/base/array/array_init.h"
+#include "hphp/runtime/base/array_init.h"
 #include "hphp/compiler/parser/parser.h"
 
 using namespace HPHP;

hphp/compiler/expression/simple_function_call.cpp

@@ -37,7 +37,7 @@
 #include "hphp/runtime/base/complex_types.h"
 #include "hphp/runtime/base/externals.h"
 #include "hphp/runtime/base/execution_context.h"
-#include "hphp/runtime/base/array/array_init.h"
+#include "hphp/runtime/base/array_init.h"
 #include "hphp/runtime/base/string_util.h"
 #include "hphp/runtime/ext/ext_variable.h"
 

hphp/runtime/base/array_data-inl.h

@@ -17,7 +17,7 @@
 #ifndef incl_HPHP_ARRAY_INLINE_H_
 #define incl_HPHP_ARRAY_INLINE_H_
 
-#include "hphp/runtime/base/array/array_data.h"
+#include "hphp/runtime/base/array_data.h"
 #include "hphp/runtime/base/complex_types.h"
 
 namespace HPHP {

hphp/runtime/base/array_data.cpp

@@ -13,13 +13,13 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include "hphp/runtime/base/array/array_data.h"
+#include "hphp/runtime/base/array_data.h"
 
 #include "tbb/concurrent_hash_map.h"
 
 #include "hphp/util/exception.h"
-#include "hphp/runtime/base/array/array_init.h"
-#include "hphp/runtime/base/array/array_iterator.h"
+#include "hphp/runtime/base/array_init.h"
+#include "hphp/runtime/base/array_iterator.h"
 #include "hphp/runtime/base/type_conversions.h"
 #include "hphp/runtime/base/builtin_functions.h"
 #include "hphp/runtime/base/complex_types.h"
@@ -27,7 +27,7 @@
 #include "hphp/runtime/base/runtime_option.h"
 #include "hphp/runtime/base/macros.h"
 #include "hphp/runtime/base/shared/shared_map.h"
-#include "hphp/runtime/base/array/policy_array.h"
+#include "hphp/runtime/base/policy_array.h"
 #include "hphp/runtime/base/comparisons.h"
 
 namespace HPHP {

hphp/runtime/base/array_init.cpp

@@ -13,9 +13,9 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
-#include "hphp/runtime/base/array/array_init.h"
-#include "hphp/runtime/base/array/policy_array.h"
-#include "hphp/runtime/base/array/hphp_array.h"
+#include "hphp/runtime/base/array_init.h"
+#include "hphp/runtime/base/policy_array.h"
+#include "hphp/runtime/base/hphp_array.h"
 #include "hphp/runtime/base/runtime_option.h"
 
 namespace HPHP {

hphp/runtime/base/array_init.h

@@ -16,7 +16,7 @@
 #ifndef incl_HPHP_ARRAY_INIT_H_
 #define incl_HPHP_ARRAY_INIT_H_
 
-#include "hphp/runtime/base/array/array_data.h"
+#include "hphp/runtime/base/array_data.h"
 #include "hphp/runtime/base/complex_types.h"
 
 namespace HPHP {

hphp/runtime/base/array_iterator.cpp

@@ -14,9 +14,9 @@
    +----------------------------------------------------------------------+
 */
 
-#include "hphp/runtime/base/array/array_iterator.h"
-#include "hphp/runtime/base/array/array_data.h"
-#include "hphp/runtime/base/array/hphp_array.h"
+#include "hphp/runtime/base/array_iterator.h"
+#include "hphp/runtime/base/array_data.h"
+#include "hphp/runtime/base/hphp_array.h"
 #include "hphp/runtime/base/complex_types.h"
 #include "hphp/runtime/base/object_data.h"
 #include "hphp/runtime/ext/ext_collections.h"

hphp/runtime/base/array_iterator.h

@@ -20,7 +20,7 @@
 #include "hphp/runtime/base/types.h"
 #include "hphp/runtime/base/util/smart_ptr.h"
 #include "hphp/runtime/base/complex_types.h"
-#include "hphp/runtime/base/array/hphp_array.h"
+#include "hphp/runtime/base/hphp_array.h"
 #include "hphp/util/min_max_macros.h"
 
 namespace HPHP {

hphp/runtime/base/array_util.cpp

@@ -14,8 +14,8 @@
    +----------------------------------------------------------------------+
 */
 
-#include "hphp/runtime/base/array/array_util.h"
-#include "hphp/runtime/base/array/array_iterator.h"
+#include "hphp/runtime/base/array_util.h"
+#include "hphp/runtime/base/array_iterator.h"
 #include "hphp/runtime/base/string_util.h"
 #include "hphp/runtime/base/builtin_functions.h"
 #include "hphp/runtime/base/runtime_error.h"

hphp/runtime/base/class_info.cpp

@@ -15,7 +15,7 @@
 */
 
 #include "hphp/runtime/base/class_info.h"
-#include "hphp/runtime/base/array/array_util.h"
+#include "hphp/runtime/base/array_util.h"
 #include "hphp/runtime/base/complex_types.h"
 #include "hphp/runtime/base/externals.h"
 #include "hphp/runtime/base/hphp_system.h"

hphp/runtime/base/complex_types.h

@@ -26,8 +26,8 @@
 #include "hphp/runtime/base/ref_data.h"
 #include "hphp/runtime/base/tv_helpers.h"
 #include "hphp/runtime/base/type_variant.h"
-#include "hphp/runtime/base/array/array_inline.h"
-#include "hphp/runtime/base/array/array_init.h"
+#include "hphp/runtime/base/array_data-inl.h"
+#include "hphp/runtime/base/array_init.h"
 
 #undef incl_HPHP_INSIDE_HPHP_COMPLEX_TYPES_H_
 

hphp/runtime/base/execution_context.cpp

@@ -23,8 +23,8 @@
 #include "hphp/util/logger.h"
 #include "hphp/util/process.h"
 #include "hphp/util/text_color.h"
-#include "hphp/runtime/base/array/array_init.h"
-#include "hphp/runtime/base/array/array_iterator.h"
+#include "hphp/runtime/base/array_init.h"
+#include "hphp/runtime/base/array_iterator.h"
 #include "hphp/runtime/base/memory/memory_manager.h"
 #include "hphp/runtime/base/memory/sweepable.h"
 #include "hphp/runtime/base/server/server_stats.h"

hphp/runtime/base/execution_context.h

@@ -24,7 +24,7 @@
 #include "hphp/runtime/base/debuggable.h"
 #include "hphp/runtime/base/server/virtual_host.h"
 #include "hphp/runtime/base/util/string_buffer.h"
-#include "hphp/runtime/base/array/hphp_array.h"
+#include "hphp/runtime/base/hphp_array.h"
 #include "hphp/runtime/vm/funcdict.h"
 #include "hphp/runtime/vm/func.h"
 #include "hphp/runtime/vm/bytecode.h"

hphp/runtime/base/file/file.cpp

@@ -23,7 +23,7 @@
 #include "hphp/runtime/base/server/virtual_host.h"
 #include "hphp/runtime/base/runtime_option.h"
 #include "hphp/runtime/base/runtime_error.h"
-#include "hphp/runtime/base/array/array_init.h"
+#include "hphp/runtime/base/array_init.h"
 #include "hphp/util/logger.h"
 #include "hphp/util/process.h"
 #include "hphp/util/util.h"
@@ -31,7 +31,7 @@
 #include "hphp/runtime/base/zend/zend_printf.h"
 #include "hphp/runtime/base/util/exceptions.h"
 #include <sys/file.h>
-#include "hphp/runtime/base/array/array_iterator.h"
+#include "hphp/runtime/base/array_iterator.h"
 #include "hphp/runtime/base/file/stream_wrapper_registry.h"
 
 namespace HPHP {

hphp/runtime/base/hphp_array.cpp

@@ -16,9 +16,9 @@
 
 #define INLINE_VARIANT_HELPER 1
 
-#include "hphp/runtime/base/array/hphp_array.h"
-#include "hphp/runtime/base/array/array_init.h"
-#include "hphp/runtime/base/array/array_iterator.h"
+#include "hphp/runtime/base/hphp_array.h"
+#include "hphp/runtime/base/array_init.h"
+#include "hphp/runtime/base/array_iterator.h"
 #include "hphp/runtime/base/complex_types.h"
 #include "hphp/runtime/base/runtime_option.h"
 #include "hphp/runtime/base/runtime_error.h"

hphp/runtime/base/hphp_array.h

@@ -18,7 +18,7 @@
 #define incl_HPHP_HPHP_ARRAY_H_
 
 #include "hphp/runtime/base/types.h"
-#include "hphp/runtime/base/array/array_data.h"
+#include "hphp/runtime/base/array_data.h"
 #include "hphp/runtime/base/memory/smart_allocator.h"
 #include "hphp/runtime/base/complex_types.h"
 

hphp/runtime/base/hphp_array_sort.cpp

@@ -14,10 +14,10 @@
    +----------------------------------------------------------------------+
 */
 
-#include "hphp/runtime/base/array/hphp_array.h"
-#include "hphp/runtime/base/array/array_init.h"
-#include "hphp/runtime/base/array/array_iterator.h"
-#include "hphp/runtime/base/array/sort_helpers.h"
+#include "hphp/runtime/base/hphp_array.h"
+#include "hphp/runtime/base/array_init.h"
+#include "hphp/runtime/base/array_iterator.h"
+#include "hphp/runtime/base/sort_helpers.h"
 #include "hphp/runtime/base/complex_types.h"
 #include "hphp/runtime/base/execution_context.h"
 #include "hphp/runtime/vm/jit/translator-inline.h"

hphp/runtime/base/hphp_system.h

@@ -37,8 +37,8 @@
 #include "hphp/runtime/base/file/plain_file.h"
 #include "hphp/runtime/base/class_info.h"
 #include "hphp/runtime/base/externals.h"
-#include "hphp/runtime/base/array/array_init.h"
-#include "hphp/runtime/base/array/array_iterator.h"
+#include "hphp/runtime/base/array_init.h"
+#include "hphp/runtime/base/array_iterator.h"
 #include "hphp/runtime/base/util/string_buffer.h"
 #include "hphp/runtime/base/util/simple_counter.h"
 #include "hphp/util/shm_counter.h"

hphp/runtime/base/intercept.cpp

@@ -15,8 +15,8 @@
 */
 #include "hphp/runtime/base/intercept.h"
 #include "hphp/runtime/base/util/request_local.h"
-#include "hphp/runtime/base/array/array_init.h"
-#include "hphp/runtime/base/array/array_iterator.h"
+#include "hphp/runtime/base/array_init.h"
+#include "hphp/runtime/base/array_iterator.h"
 #include "hphp/runtime/base/type_conversions.h"
 #include "hphp/runtime/base/builtin_functions.h"
 #include "hphp/runtime/vm/jit/target-cache.h"

hphp/runtime/base/policy_array.cpp

@@ -14,11 +14,11 @@
    +----------------------------------------------------------------------+
 */
 
-#include "hphp/runtime/base/array/policy_array.h"
-#include "hphp/runtime/base/array/array_init.h"
-#include "hphp/runtime/base/array/array_iterator.h"
-#include "hphp/runtime/base/array/hphp_array.h"
-#include "hphp/runtime/base/array/sort_helpers.h"
+#include "hphp/runtime/base/policy_array.h"
+#include "hphp/runtime/base/array_init.h"
+#include "hphp/runtime/base/array_iterator.h"
+#include "hphp/runtime/base/hphp_array.h"
+#include "hphp/runtime/base/sort_helpers.h"
 #include "folly/Foreach.h"
 
 TRACE_SET_MOD(runtime);
@@ -596,9 +596,9 @@ void PolicyArray::nextInsertWithRef(const Variant& v) {
   // We need to define k here (before the if/grow) because otherwise
   // the overzealous gcc issues a spurious warning as such:
   //
-  // hphp/runtime/base/array/policy_array.h: In member function 'void
+  // hphp/runtime/base/policy_array.h: In member function 'void
   // HPHP::PolicyArray::nextInsertWithRef(const HPHP::Variant&)':
-  // hphp/runtime/base/array/policy_array.h:114:5: error: assuming
+  // hphp/runtime/base/policy_array.h:114:5: error: assuming
   // signed overflow does not occur when assuming that (X + c) < X is
   // always false [-Werror=strict-overflow]
   auto const k = nextKeyBump();

hphp/runtime/base/policy_array.h

@@ -18,7 +18,7 @@
 #define HPHP_POLICY_ARRAY_H_
 
 #include "hphp/runtime/base/types.h"
-#include "hphp/runtime/base/array/array_data.h"
+#include "hphp/runtime/base/array_data.h"
 #include "hphp/runtime/base/memory/smart_allocator.h"
 #include "hphp/runtime/base/complex_types.h"
 #include "hphp/util/trace.h"

hphp/runtime/base/preg.cpp

@@ -22,7 +22,7 @@
 #include "hphp/runtime/base/runtime_option.h"
 #include "hphp/runtime/base/builtin_functions.h"
 #include "hphp/runtime/base/zend/zend_functions.h"
-#include "hphp/runtime/base/array/array_iterator.h"
+#include "hphp/runtime/base/array_iterator.h"
 #include "hphp/runtime/base/ini_setting.h"
 #include "hphp/runtime/base/thread_init_fini.h"
 #include "tbb/concurrent_hash_map.h"

hphp/runtime/base/server/server_stats.cpp

@@ -22,7 +22,7 @@
 #include "hphp/runtime/base/preg.h"
 #include "hphp/runtime/base/comparisons.h"
 #include "hphp/runtime/base/time/datetime.h"
-#include "hphp/runtime/base/array/array_init.h"
+#include "hphp/runtime/base/array_init.h"
 #include "hphp/util/json.h"
 #include "hphp/util/compatibility.h"
 #include "hphp/util/process.h"

hphp/runtime/base/shared/immutable_map.cpp

@@ -16,7 +16,7 @@
 
 #include "hphp/runtime/base/shared/shared_variant.h"
 #include "hphp/runtime/base/shared/immutable_map.h"
-#include "hphp/runtime/base/array/array_iterator.h"
+#include "hphp/runtime/base/array_iterator.h"
 
 namespace HPHP {
 

hphp/runtime/base/shared/immutable_obj.cpp

@@ -17,8 +17,8 @@
 #include "hphp/runtime/base/shared/shared_variant.h"
 #include "hphp/runtime/base/shared/immutable_obj.h"
 #include "hphp/runtime/base/externals.h"
-#include "hphp/runtime/base/array/array_init.h"
-#include "hphp/runtime/base/array/array_iterator.h"
+#include "hphp/runtime/base/array_init.h"
+#include "hphp/runtime/base/array_iterator.h"
 #include "hphp/runtime/base/class_info.h"
 #include "hphp/runtime/base/builtin_functions.h"
 

hphp/runtime/base/shared/shared_map.cpp

@@ -16,8 +16,8 @@
 
 #include "hphp/runtime/base/shared/shared_map.h"
 #include "hphp/runtime/base/type_conversions.h"
-#include "hphp/runtime/base/array/array_iterator.h"
-#include "hphp/runtime/base/array/array_init.h"
+#include "hphp/runtime/base/array_iterator.h"
+#include "hphp/runtime/base/array_init.h"
 #include "hphp/runtime/base/runtime_option.h"
 #include "hphp/runtime/base/runtime_error.h"
 

hphp/runtime/base/shared/shared_map.h

@@ -19,7 +19,7 @@
 
 #include "hphp/util/shared_memory_allocator.h"
 #include "hphp/runtime/base/shared/shared_variant.h"
-#include "hphp/runtime/base/array/array_data.h"
+#include "hphp/runtime/base/array_data.h"
 #include "hphp/runtime/base/complex_types.h"
 #include "hphp/runtime/base/builtin_functions.h"
 

hphp/runtime/base/string_util.cpp

@@ -19,7 +19,7 @@
 #include "hphp/runtime/base/zend/zend_string.h"
 #include "hphp/runtime/base/zend/zend_url.h"
 #include "hphp/runtime/base/runtime_error.h"
-#include "hphp/runtime/base/array/array_iterator.h"
+#include "hphp/runtime/base/array_iterator.h"
 #include "hphp/runtime/base/builtin_functions.h"
 
 namespace HPHP {

hphp/runtime/base/time/datetime.cpp

@@ -21,7 +21,7 @@
 #include "hphp/runtime/base/runtime_error.h"
 #include "hphp/runtime/base/type_conversions.h"
 #include "hphp/runtime/base/builtin_functions.h"
-#include "hphp/runtime/base/array/array_init.h"
+#include "hphp/runtime/base/array_init.h"
 
 namespace HPHP {
 

hphp/runtime/base/time/timestamp.cpp

@@ -17,7 +17,7 @@
 #include "hphp/runtime/base/time/timestamp.h"
 #include "hphp/runtime/base/complex_types.h"
 #include "hphp/runtime/base/time/datetime.h"
-#include "hphp/runtime/base/array/array_init.h"
+#include "hphp/runtime/base/array_init.h"
 #include <timelib.h>
 
 namespace HPHP {

hphp/runtime/base/time/timezone.cpp

@@ -21,7 +21,7 @@
 #include "hphp/runtime/base/type_conversions.h"
 #include "hphp/runtime/base/builtin_functions.h"
 #include "hphp/runtime/base/runtime_error.h"
-#include "hphp/runtime/base/array/array_init.h"
+#include "hphp/runtime/base/array_init.h"
 #include "hphp/util/logger.h"
 
 namespace HPHP {

hphp/runtime/base/type_array.cpp

@@ -25,7 +25,7 @@
 #include "hphp/runtime/base/zend/zend_string.h"
 #include "hphp/runtime/base/zend/zend_qsort.h"
 #include "hphp/runtime/base/zend/zend_printf.h"
-#include "hphp/runtime/base/array/array_util.h"
+#include "hphp/runtime/base/array_util.h"
 #include "hphp/runtime/base/runtime_option.h"
 #include "hphp/runtime/ext/ext_iconv.h"
 #include "unicode/coll.h" // icu

hphp/runtime/base/type_array.h

@@ -26,7 +26,7 @@
 
 #include "hphp/runtime/base/util/smart_ptr.h"
 #include "hphp/runtime/base/types.h"
-#include "hphp/runtime/base/array/array_data.h"
+#include "hphp/runtime/base/array_data.h"
 #include "hphp/runtime/base/type_string.h"
 #include "hphp/runtime/base/hphp_value.h"
 

hphp/runtime/base/type_object.cpp

@@ -18,7 +18,7 @@
 #include "hphp/runtime/base/type_conversions.h"
 #include "hphp/runtime/base/builtin_functions.h"
 #include "hphp/runtime/base/variable_serializer.h"
-#include "hphp/runtime/base/array/array_iterator.h"
+#include "hphp/runtime/base/array_iterator.h"
 #include "hphp/runtime/base/strings.h"
 #include "hphp/runtime/ext/ext_collections.h"
 

hphp/runtime/base/type_variant.cpp

@@ -23,7 +23,7 @@
 #include "hphp/runtime/ext/ext_variable.h"
 #include "hphp/runtime/base/runtime_option.h"
 #include "hphp/runtime/base/zend/zend_string.h"
-#include "hphp/runtime/base/array/array_iterator.h"
+#include "hphp/runtime/base/array_iterator.h"
 #include "hphp/util/parser/hphp.tab.hpp"
 #include "hphp/runtime/vm/runtime.h"
 #include "hphp/system/systemlib.h"

hphp/runtime/base/type_variant.h

@@ -31,7 +31,7 @@
 #include "hphp/runtime/base/type_object.h"
 #include "hphp/runtime/base/type_array.h"
 #include "hphp/runtime/base/memory/smart_allocator.h"
-#include "hphp/runtime/base/array/array_data.h"
+#include "hphp/runtime/base/array_data.h"
 #include "hphp/runtime/base/macros.h"
 
 namespace HPHP {

hphp/runtime/base/util/extended_logger.cpp

@@ -17,7 +17,7 @@
 #include "hphp/runtime/base/util/extended_logger.h"
 #include "hphp/runtime/base/execution_context.h"
 #include "hphp/runtime/base/runtime_option.h"
-#include "hphp/runtime/base/array/array_iterator.h"
+#include "hphp/runtime/base/array_iterator.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 

hphp/runtime/base/variable_serializer.cpp

@@ -24,7 +24,7 @@
 #include <math.h>
 #include <cmath>
 #include "hphp/runtime/base/runtime_option.h"
-#include "hphp/runtime/base/array/array_iterator.h"
+#include "hphp/runtime/base/array_iterator.h"
 #include "hphp/runtime/base/util/request_local.h"
 #include "hphp/runtime/ext/ext_json.h"
 #include "hphp/runtime/ext/ext_collections.h"

hphp/runtime/base/variable_unserializer.cpp

@@ -17,7 +17,7 @@
 #include "hphp/runtime/base/variable_unserializer.h"
 #include "hphp/runtime/base/complex_types.h"
 #include "hphp/runtime/base/zend/zend_strtod.h"
-#include "hphp/runtime/base/array/array_iterator.h"
+#include "hphp/runtime/base/array_iterator.h"
 #include "hphp/runtime/ext/ext_class.h"
 
 namespace HPHP {

hphp/runtime/base/zend/zend_collator.cpp

@@ -22,7 +22,7 @@
 #include "hphp/runtime/base/types.h"
 #include "hphp/runtime/base/complex_types.h"
 #include "hphp/runtime/base/runtime_error.h"
-#include "hphp/runtime/base/array/array_iterator.h"
+#include "hphp/runtime/base/array_iterator.h"
 #include "hphp/runtime/base/comparisons.h"
 
 namespace HPHP {

hphp/runtime/base/zend/zend_printf.cpp

@@ -21,7 +21,7 @@
 #include "hphp/runtime/base/complex_types.h"
 #include "hphp/runtime/base/type_conversions.h"
 #include "hphp/runtime/base/builtin_functions.h"
-#include "hphp/runtime/base/array/array_iterator.h"
+#include "hphp/runtime/base/array_iterator.h"
 #include <math.h>
 
 #if defined(__APPLE__)

hphp/runtime/debugger/cmd/cmd_machine.cpp

@@ -18,7 +18,7 @@
 #include "hphp/runtime/debugger/cmd/cmd_signal.h"
 #include "hphp/runtime/base/runtime_option.h"
 #include "hphp/runtime/base/intercept.h"
-#include "hphp/runtime/base/array/array_init.h"
+#include "hphp/runtime/base/array_init.h"
 #include "hphp/runtime/base/util/libevent_http_client.h"
 #include "hphp/util/process.h"
 

hphp/runtime/debugger/cmd/cmd_where.cpp

@@ -15,7 +15,7 @@
 */
 
 #include "hphp/runtime/debugger/cmd/cmd_where.h"
-#include "hphp/runtime/base/array/array_iterator.h"
+#include "hphp/runtime/base/array_iterator.h"
 #include "hphp/runtime/base/comparisons.h"
 
 namespace HPHP { namespace Eval {

hphp/runtime/ext/ext_array.cpp

@@ -25,7 +25,7 @@
 #include "hphp/runtime/base/sort_flags.h"
 #include "hphp/runtime/vm/jit/translator.h"
 #include "hphp/runtime/vm/jit/translator-inline.h"
-#include "hphp/runtime/base/array/hphp_array.h"
+#include "hphp/runtime/base/hphp_array.h"
 #include "hphp/util/logger.h"
 
 #define SORT_DESC               3

hphp/runtime/ext/ext_array.h

@@ -19,7 +19,7 @@
 #define incl_HPHP_EXT_ARRAY_H_
 
 #include "hphp/runtime/base/base_includes.h"
-#include "hphp/runtime/base/array/array_util.h"
+#include "hphp/runtime/base/array_util.h"
 #include "hphp/runtime/base/zend/zend_collator.h"
 
 namespace HPHP {

hphp/runtime/ext/ext_collections.cpp

@@ -17,7 +17,7 @@
 
 #include "hphp/runtime/ext/ext_collections.h"
 #include "hphp/runtime/base/variable_serializer.h"
-#include "hphp/runtime/base/array/sort_helpers.h"
+#include "hphp/runtime/base/sort_helpers.h"
 #include "hphp/runtime/ext/ext_array.h"
 #include "hphp/runtime/ext/ext_math.h"
 #include "hphp/runtime/ext/ext_intl.h"

hphp/runtime/ext/ext_file.cpp

@@ -23,7 +23,7 @@
 #include "hphp/runtime/base/runtime_option.h"
 #include "hphp/runtime/base/runtime_error.h"
 #include "hphp/runtime/base/ini_setting.h"
-#include "hphp/runtime/base/array/array_util.h"
+#include "hphp/runtime/base/array_util.h"
 #include "hphp/runtime/base/util/http_client.h"
 #include "hphp/runtime/base/util/request_local.h"
 #include "hphp/runtime/base/server/static_content_cache.h"

hphp/runtime/ext/ext_session.cpp

@@ -26,7 +26,7 @@
 #include "hphp/runtime/base/ini_setting.h"
 #include "hphp/runtime/base/time/datetime.h"
 #include "hphp/runtime/base/variable_unserializer.h"
-#include "hphp/runtime/base/array/array_iterator.h"
+#include "hphp/runtime/base/array_iterator.h"
 #include "hphp/util/lock.h"
 #include "hphp/util/logger.h"
 #include "hphp/util/compatibility.h"

hphp/runtime/vm/backup_gc.cpp

@@ -29,7 +29,7 @@
 #include "hphp/runtime/base/memory/smart_allocator.h"
 #include "hphp/runtime/base/memory/memory_manager.h"
 #include "hphp/runtime/base/complex_types.h"
-#include "hphp/runtime/base/array/hphp_array.h"
+#include "hphp/runtime/base/hphp_array.h"
 #include "hphp/runtime/vm/class.h"
 
 namespace HPHP {

hphp/runtime/vm/bytecode.cpp

@@ -36,7 +36,7 @@
 #include "hphp/runtime/base/base_includes.h"
 #include "hphp/runtime/base/execution_context.h"
 #include "hphp/runtime/base/runtime_option.h"
-#include "hphp/runtime/base/array/hphp_array.h"
+#include "hphp/runtime/base/hphp_array.h"
 #include "hphp/runtime/base/strings.h"
 #include "hphp/util/util.h"
 #include "hphp/util/trace.h"

hphp/runtime/vm/bytecode.h

@@ -25,7 +25,7 @@
 #include "hphp/runtime/base/tv_arith.h"
 #include "hphp/runtime/base/tv_conversions.h"
 #include "hphp/runtime/base/class_info.h"
-#include "hphp/runtime/base/array/array_iterator.h"
+#include "hphp/runtime/base/array_iterator.h"
 #include "hphp/runtime/vm/class.h"
 #include "hphp/runtime/vm/unit.h"
 #include "hphp/runtime/vm/func.h"

hphp/runtime/vm/class.cpp

@@ -15,7 +15,7 @@
 */
 #include "hphp/runtime/base/complex_types.h"
 #include "hphp/runtime/base/comparisons.h"
-#include "hphp/runtime/base/array/hphp_array.h"
+#include "hphp/runtime/base/hphp_array.h"
 #include "hphp/util/util.h"
 #include "hphp/util/debug.h"
 #include "hphp/runtime/vm/jit/target-cache.h"

hphp/runtime/vm/jit/code-gen.cpp

@@ -24,7 +24,7 @@
 #include "hphp/util/trace.h"
 #include "hphp/util/util.h"
 
-#include "hphp/runtime/base/array/hphp_array.h"
+#include "hphp/runtime/base/hphp_array.h"
 #include "hphp/runtime/base/comparisons.h"
 #include "hphp/runtime/base/complex_types.h"
 #include "hphp/runtime/base/runtime_option.h"

hphp/runtime/vm/name_value_table_wrapper.cpp

@@ -16,8 +16,8 @@
 
 #include "hphp/runtime/vm/name_value_table_wrapper.h"
 #include "hphp/runtime/base/runtime_error.h"
-#include "hphp/runtime/base/array/array_iterator.h"
-#include "hphp/runtime/base/array/array_init.h"
+#include "hphp/runtime/base/array_iterator.h"
+#include "hphp/runtime/base/array_init.h"
 
 namespace HPHP {
 

hphp/runtime/vm/name_value_table_wrapper.h

@@ -17,7 +17,7 @@
 #define incl_HPHP_RUNTIME_VM_NAME_VALUE_TABLE_WRAPPER_H
 
 #include "hphp/runtime/vm/name_value_table.h"
-#include "hphp/runtime/base/array/array_data.h"
+#include "hphp/runtime/base/array_data.h"
 
 namespace HPHP {
 

hphp/runtime/vm/runtime.cpp

@@ -17,7 +17,7 @@
 #include "hphp/runtime/base/execution_context.h"
 #include "hphp/runtime/base/complex_types.h"
 #include "hphp/runtime/base/zend/zend_string.h"
-#include "hphp/runtime/base/array/hphp_array.h"
+#include "hphp/runtime/base/hphp_array.h"
 #include "hphp/runtime/base/builtin_functions.h"
 #include "hphp/runtime/ext/ext_closure.h"
 #include "hphp/runtime/ext/ext_continuation.h"

hphp/runtime/vm/unit.h

@@ -23,7 +23,7 @@
 #include "hphp/runtime/base/complex_types.h"
 #include "hphp/runtime/vm/repo_helpers.h"
 #include "hphp/runtime/vm/named_entity.h"
-#include "hphp/runtime/base/array/hphp_array.h"
+#include "hphp/runtime/base/hphp_array.h"
 #include "hphp/util/range.h"
 #include "hphp/util/parser/location.h"
 #include "hphp/runtime/base/md5.h"

hphp/tools/bootstrap/gen-ext-hhvm.cpp

@@ -45,7 +45,7 @@ bool g_armMode = false;
 constexpr char* g_allIncludes = R"(
 #include "hphp/runtime/ext_hhvm/ext_hhvm.h"
 #include "hphp/runtime/base/builtin_functions.h"
-#include "hphp/runtime/base/array/array_init.h"
+#include "hphp/runtime/base/array_init.h"
 #include "hphp/runtime/ext/ext.h"
 #include "hphp/runtime/vm/class.h"
 #include "hphp/runtime/vm/runtime.h"