From f9b6d0123962082a70041d86f46c84cab007af9b Mon Sep 17 00:00:00 2001
From: Yedidya Feldblum <yfeldblum@fb.com>
Date: Sun, 29 Oct 2017 03:33:10 -0700
Subject: [PATCH] Move folly/Array.h

Summary: [Folly] Move `folly/Array.h` to `folly/container/`.

Reviewed By: luciang

Differential Revision: D6182858

fbshipit-source-id: 59340b96058cc6d0c7a0289e316bbde98c15d724
---
 folly/Makefile.am                        | 2 +-
 folly/{ => container}/Array.h            | 0
 folly/{ => container}/test/ArrayTest.cpp | 2 +-
 folly/gen/test/FileTest.cpp              | 2 +-
 folly/io/async/SSLOptions.h              | 2 +-
 folly/test/Makefile.am                   | 2 +-
 folly/test/SocketAddressTest.cpp         | 2 +-
 folly/test/StringTest.cpp                | 2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename folly/{ => container}/Array.h (100%)
 rename folly/{ => container}/test/ArrayTest.cpp (98%)

diff --git a/folly/Makefile.am b/folly/Makefile.am
index dafdd730..a35a4a94 100644
--- a/folly/Makefile.am
+++ b/folly/Makefile.am
@@ -27,7 +27,6 @@ lib_LTLIBRARIES = \
 follyincludedir = $(includedir)/folly
 
 nobase_follyinclude_HEADERS = \
-	Array.h \
 	Assume.h \
 	AtomicBitSet.h \
 	AtomicHashArray.h \
@@ -58,6 +57,7 @@ nobase_follyinclude_HEADERS = \
 	concurrency/ConcurrentHashMap.h \
 	concurrency/CoreCachedSharedPtr.h \
 	concurrency/detail/ConcurrentHashMap-detail.h \
+	container/Array.h \
 	container/Iterator.h \
 	container/Enumerate.h \
 	container/EvictingCacheMap.h \
diff --git a/folly/Array.h b/folly/container/Array.h
similarity index 100%
rename from folly/Array.h
rename to folly/container/Array.h
diff --git a/folly/test/ArrayTest.cpp b/folly/container/test/ArrayTest.cpp
similarity index 98%
rename from folly/test/ArrayTest.cpp
rename to folly/container/test/ArrayTest.cpp
index 29e32574..04b877e2 100644
--- a/folly/test/ArrayTest.cpp
+++ b/folly/container/test/ArrayTest.cpp
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <folly/Array.h>
+#include <folly/container/Array.h>
 #include <folly/portability/GTest.h>
 #include <string>
 
diff --git a/folly/gen/test/FileTest.cpp b/folly/gen/test/FileTest.cpp
index 5e9edbbc..300459dd 100644
--- a/folly/gen/test/FileTest.cpp
+++ b/folly/gen/test/FileTest.cpp
@@ -16,9 +16,9 @@
 #include <string>
 #include <vector>
 
-#include <folly/Array.h>
 #include <folly/File.h>
 #include <folly/Range.h>
+#include <folly/container/Array.h>
 #include <folly/experimental/TestUtil.h>
 #include <folly/gen/Base.h>
 #include <folly/gen/File.h>
diff --git a/folly/io/async/SSLOptions.h b/folly/io/async/SSLOptions.h
index a808d557..45ffd58c 100644
--- a/folly/io/async/SSLOptions.h
+++ b/folly/io/async/SSLOptions.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <folly/Array.h>
+#include <folly/container/Array.h>
 #include <folly/io/async/SSLContext.h>
 
 namespace folly {
diff --git a/folly/test/Makefile.am b/folly/test/Makefile.am
index 2199f890..0a566930 100644
--- a/folly/test/Makefile.am
+++ b/folly/test/Makefile.am
@@ -45,7 +45,7 @@ spin_lock_test_SOURCES = SpinLockTest.cpp
 spin_lock_test_LDADD = libfollytestmain.la
 TESTS += spin_lock_test
 
-array_test_SOURCES = ArrayTest.cpp
+array_test_SOURCES = ../container/test/ArrayTest.cpp
 array_test_LDADD = libfollytestmain.la
 TESTS += array_test
 
diff --git a/folly/test/SocketAddressTest.cpp b/folly/test/SocketAddressTest.cpp
index e9e706b4..de654ac1 100644
--- a/folly/test/SocketAddressTest.cpp
+++ b/folly/test/SocketAddressTest.cpp
@@ -20,8 +20,8 @@
 #include <sstream>
 #include <system_error>
 
-#include <folly/Array.h>
 #include <folly/String.h>
+#include <folly/container/Array.h>
 #include <folly/experimental/TestUtil.h>
 #include <folly/portability/GTest.h>
 #include <folly/portability/Sockets.h>
diff --git a/folly/test/StringTest.cpp b/folly/test/StringTest.cpp
index 56383430..4140d7d2 100644
--- a/folly/test/StringTest.cpp
+++ b/folly/test/StringTest.cpp
@@ -24,7 +24,7 @@
 
 #include <boost/regex.hpp>
 
-#include <folly/Array.h>
+#include <folly/container/Array.h>
 #include <folly/portability/GTest.h>
 
 using namespace folly;
-- 
2.34.1