Skip to content

Commit

Permalink
Move folly containers to folly/container/
Browse files Browse the repository at this point in the history
Summary:
The following targets were moved to folly/container:
```
//folly:sorted_vector_types
//folly:fbvector
//folly:intrusive_list
//folly:map_util
//folly:small_vector
//folly/test:fbvector_benchmark
//folly/test:fbvector_test
//folly/test:map_util_test
//folly/test:small_vector_test
//folly/test:sorted_vector_types_test
```

`arc f` was applied

This is a codemod. It was automatically generated and will be landed once it is approved and tests are passing in sandcastle.
You have been added as a reviewer by Sentinel or Butterfly.

Differential Revision: D56259512

fbshipit-source-id: d9dd7bbe59ee7fc0d6ddb2b463fb5057976e4a3f
  • Loading branch information
Gownta authored and facebook-github-bot committed May 10, 2024
1 parent 916a985 commit 6281133
Show file tree
Hide file tree
Showing 23 changed files with 5,508 additions and 5,366 deletions.
18 changes: 9 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -619,10 +619,18 @@ if (BUILD_TESTS OR BUILD_BENCHMARKS)
TEST f14_fwd_test SOURCES F14FwdTest.cpp
TEST f14_map_test SOURCES F14MapTest.cpp
TEST f14_set_test WINDOWS_DISABLED SOURCES F14SetTest.cpp
TEST heap_vector_types_test SOURCES heap_vector_types_test.cpp
BENCHMARK fbvector_benchmark
SOURCES FBVectorBenchmark.cpp
HEADERS FBVectorBenchmarks.cpp.h
TEST fbvector_test SOURCES FBVectorTest.cpp
BENCHMARK foreach_benchmark SOURCES ForeachBenchmark.cpp
TEST foreach_test SOURCES ForeachTest.cpp
TEST heap_vector_types_test SOURCES heap_vector_types_test.cpp
TEST map_util_test WINDOWS_DISABLED SOURCES MapUtilTest.cpp
TEST merge_test SOURCES MergeTest.cpp
TEST small_vector_test WINDOWS_DISABLED
SOURCES small_vector_test.cpp
TEST sorted_vector_types_test SOURCES sorted_vector_test.cpp
BENCHMARK sparse_byte_set_benchmark WINDOWS_DISABLED
SOURCES SparseByteSetBenchmark.cpp
TEST sparse_byte_set_test SOURCES SparseByteSetTest.cpp
Expand Down Expand Up @@ -1003,10 +1011,6 @@ if (BUILD_TESTS OR BUILD_BENCHMARKS)
SOURCES FBStringBenchmark.cpp
HEADERS FBStringTestBenchmarks.cpp.h
TEST fbstring_test WINDOWS_DISABLED SOURCES FBStringTest.cpp
BENCHMARK fbvector_benchmark
SOURCES FBVectorBenchmark.cpp
HEADERS FBVectorBenchmarks.cpp.h
TEST fbvector_test SOURCES FBVectorTest.cpp
TEST file_test SOURCES FileTest.cpp
# Open-source linux build can't handle running this.
#TEST file_lock_test SOURCES FileLockTest.cpp
Expand All @@ -1032,7 +1036,6 @@ if (BUILD_TESTS OR BUILD_BENCHMARKS)
TEST lazy_test SOURCES LazyTest.cpp
TEST locks_test SOURCES SpinLockTest.cpp
TEST math_test SOURCES MathTest.cpp
TEST map_util_test WINDOWS_DISABLED SOURCES MapUtilTest.cpp
TEST memcpy_test SOURCES MemcpyTest.cpp
TEST memory_idler_test SOURCES MemoryIdlerTest.cpp
TEST memory_test WINDOWS_DISABLED
Expand Down Expand Up @@ -1067,9 +1070,6 @@ if (BUILD_TESTS OR BUILD_BENCHMARKS)
# SingletonTest requires Subprocess
#TEST singleton_test SOURCES SingletonTest.cpp
TEST singleton_test_global SOURCES SingletonTestGlobal.cpp
TEST small_vector_test WINDOWS_DISABLED
SOURCES small_vector_test.cpp
TEST sorted_vector_types_test SOURCES sorted_vector_test.cpp
BENCHMARK string_benchmark WINDOWS_DISABLED SOURCES StringBenchmark.cpp
TEST string_test WINDOWS_DISABLED SOURCES StringTest.cpp
BENCHMARK synchronized_benchmark WINDOWS_DISABLED
Expand Down
60 changes: 18 additions & 42 deletions folly/BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -461,16 +461,11 @@ cpp_library(

cpp_library(
name = "fbvector",
headers = ["FBVector.h"],
headers = [
"FBVector.h",
],
exported_deps = [
":format_traits",
":likely",
":scope_guard",
":traits",
"//folly/lang:checked_math",
"//folly/lang:exception",
"//folly/lang:hint",
"//folly/memory:malloc",
"//folly/container:fbvector",
],
)

Expand Down Expand Up @@ -657,9 +652,11 @@ cpp_library(

cpp_library(
name = "intrusive_list",
headers = ["IntrusiveList.h"],
exported_external_deps = [
"boost",
headers = [
"IntrusiveList.h",
],
exported_deps = [
"//folly/container:intrusive_list",
],
)

Expand Down Expand Up @@ -720,12 +717,11 @@ cpp_library(

cpp_library(
name = "map_util",
headers = ["MapUtil.h"],
headers = [
"MapUtil.h",
],
exported_deps = [
":conv",
":optional",
":range",
"//folly/functional:invoke",
"//folly/container:map_util",
],
)

Expand Down Expand Up @@ -1225,26 +1221,11 @@ cpp_library(

cpp_library(
name = "small_vector",
headers = ["small_vector.h"],
exported_deps = [
":constexpr_math",
":format_traits",
":likely",
":portability",
":scope_guard",
":traits",
"//folly/functional:invoke",
"//folly/hash:hash",
"//folly/lang:align",
"//folly/lang:assume",
"//folly/lang:checked_math",
"//folly/lang:exception",
"//folly/memory:malloc",
"//folly/memory:sanitize_leak",
"//folly/portability:malloc",
headers = [
"small_vector.h",
],
exported_external_deps = [
"boost",
exported_deps = [
"//folly/container:small_vector",
],
)

Expand All @@ -1254,12 +1235,7 @@ cpp_library(
"sorted_vector_types.h",
],
exported_deps = [
":scope_guard",
":traits",
":utility",
"//folly/lang:access",
"//folly/lang:exception",
"//folly/memory:memory_resource",
"//folly/container:sorted_vector_types",
],
)

Expand Down

0 comments on commit 6281133

Please sign in to comment.