diff --git a/.buckconfig.d/common.buckconfig b/.buckconfig.d/common.buckconfig index edac3a7f820..6260475b820 100644 --- a/.buckconfig.d/common.buckconfig +++ b/.buckconfig.d/common.buckconfig @@ -5,6 +5,7 @@ none = none [cell_aliases] config = prelude ovr_config = prelude +antlir = gh_facebookincubator_antlir bazel_skylib = gh_facebook_buck2_shims_meta buck = gh_facebook_buck2_shims_meta fbcode = gh_facebook_buck2_shims_meta diff --git a/.buckconfig.d/external_cells/facebook/buck2-shims-meta/external_cell.buckconfig b/.buckconfig.d/external_cells/facebook/buck2-shims-meta/external_cell.buckconfig index 80e0a551976..b6d14b32884 100644 --- a/.buckconfig.d/external_cells/facebook/buck2-shims-meta/external_cell.buckconfig +++ b/.buckconfig.d/external_cells/facebook/buck2-shims-meta/external_cell.buckconfig @@ -5,5 +5,5 @@ gh_facebook_buck2_shims_meta = gh_facebook_buck2_shims_meta gh_facebook_buck2_shims_meta = git [external_cell_gh_facebook_buck2_shims_meta] -git_origin = https://github.com/facebook/buck2-shims-meta.git -commit_hash = b8af53c75c0ae387b761fcb68e157893eec810b3 +git_origin = https://github.com/ben--/buck2-shims-meta.git +commit_hash = bbee045527318b26935345d74d4ba020022b91c8 diff --git a/.buckconfig.d/external_cells/facebookincubator/antlir/external_cell.buckconfig b/.buckconfig.d/external_cells/facebookincubator/antlir/external_cell.buckconfig new file mode 100644 index 00000000000..10580ba56b5 --- /dev/null +++ b/.buckconfig.d/external_cells/facebookincubator/antlir/external_cell.buckconfig @@ -0,0 +1,18 @@ +[cells] +gh_facebookincubator_antlir = gh_facebookincubator_antlir +gh_facebookincubator_antlir_generated = generated + +[cell_aliases] +generated = gh_facebookincubator_antlir_generated + +[external_cells] +gh_facebookincubator_antlir = git +gh_facebookincubator_antlir_generated = git + +[external_cell_gh_facebookincubator_antlir] +git_origin = https://github.com/ben--/antlir.git +commit_hash = e81a223fd851230b4e3141784565a95abaffdf11 + +[external_cell_gh_facebookincubator_antlir_generated] +git_origin = https://github.com/ben--/antlir.git +commit_hash = e81a223fd851230b4e3141784565a95abaffdf11 diff --git a/buck2 b/buck2 index 9bcf4621127..1a89dcb2323 100755 --- a/buck2 +++ b/buck2 @@ -4,86 +4,86 @@ "name": "buck2", "platforms": { "macos-aarch64": { - "size": 33130602, + "size": 33157715, "hash": "blake3", - "digest": "9784bb4d76ebf6eca0a7c53099aea1e236516d03cdcae9ed8f468c66c7ebcfed", + "digest": "b3025db0b8042c1de0936ae8f64065b524c31c093fdce56a9bf05547f568a209", "format": "zst", "path": "buck2-aarch64-apple-darwin", "providers": [ { - "url": "https://github.com/facebook/buck2/releases/download/2026-01-19/buck2-aarch64-apple-darwin.zst" + "url": "https://github.com/ben--/buck2/releases/download/latest/buck2-aarch64-apple-darwin.zst" } ] }, "windows-aarch64": { - "size": 28850798, + "size": 28915222, "hash": "blake3", - "digest": "9cfbf83937b4322147836dc7d62495e2b273216ae0505782f47974fdcf1331d1", + "digest": "5dc91a371d97479cedbe04674c26453b860327df73b4bf9656afdaafa7aed5ba", "format": "zst", "path": "buck2-aarch64-pc-windows-msvc.exe", "providers": [ { - "url": "https://github.com/facebook/buck2/releases/download/2026-01-19/buck2-aarch64-pc-windows-msvc.exe.zst" + "url": "https://github.com/ben--/buck2/releases/download/latest/buck2-aarch64-pc-windows-msvc.exe.zst" } ] }, "linux-aarch64": { - "size": 34458590, + "size": 34500337, "hash": "blake3", - "digest": "cea32696e5da99c020b3e208230e01a33c09b871b5fa9a4a2fc6ae5e1481d358", + "digest": "8f36488f36bfbf9acc8febfda08e94523ee7c37ab7be35d5a7c17d908f251200", "format": "zst", "path": "buck2-aarch64-unknown-linux-musl", "providers": [ { - "url": "https://github.com/facebook/buck2/releases/download/2026-01-19/buck2-aarch64-unknown-linux-musl.zst" + "url": "https://github.com/ben--/buck2/releases/download/latest/buck2-aarch64-unknown-linux-musl.zst" } ] }, "linux-riscv64": { - "size": 36831594, + "size": 36879857, "hash": "blake3", - "digest": "e4ae8c2f5e595fb8d5cbaf2085f29cec2e7b9f801790a83d0a507897604675c3", + "digest": "f57e5579733f08fe9cdd44f5ec159cf05c09dbd95ba55d65f7f486ba7d114824", "format": "zst", "path": "buck2-riscv64gc-unknown-linux-gnu", "providers": [ { - "url": "https://github.com/facebook/buck2/releases/download/2026-01-19/buck2-riscv64gc-unknown-linux-gnu.zst" + "url": "https://github.com/ben--/buck2/releases/download/latest/buck2-riscv64gc-unknown-linux-gnu.zst" } ] }, "macos-x86_64": { - "size": 35364232, + "size": 35388093, "hash": "blake3", - "digest": "10f3be885098290ff58ff10c561efadcede0e5e755ca13fa468ac0ee2046145e", + "digest": "cb7d1d8f57d8f51ef05f9cf781519671f5c99c33825977466f2954fd9f795aa4", "format": "zst", "path": "buck2-x86_64-apple-darwin", "providers": [ { - "url": "https://github.com/facebook/buck2/releases/download/2026-01-19/buck2-x86_64-apple-darwin.zst" + "url": "https://github.com/ben--/buck2/releases/download/latest/buck2-x86_64-apple-darwin.zst" } ] }, "windows-x86_64": { - "size": 30315696, + "size": 30300555, "hash": "blake3", - "digest": "f5aed51901a811548b36446f2e48a8f2ede82080a128458a9f6dc31d1dbcb7b6", + "digest": "1fa49b8c144ccef004e147544f95332e9f5856f36a3bd9865ab806803681f2ff", "format": "zst", "path": "buck2-x86_64-pc-windows-msvc.exe", "providers": [ { - "url": "https://github.com/facebook/buck2/releases/download/2026-01-19/buck2-x86_64-pc-windows-msvc.exe.zst" + "url": "https://github.com/ben--/buck2/releases/download/latest/buck2-x86_64-pc-windows-msvc.exe.zst" } ] }, "linux-x86_64": { - "size": 35850428, + "size": 35864238, "hash": "blake3", - "digest": "a33ddcb56a1c8b7f85d87b0e233fe2330ae2a72f5f8570b856bb85c3577d47ad", + "digest": "5671ce1cb40effca73eeffca156e00a24f0434ef61b6e7ece13e773364acdaf8", "format": "zst", "path": "buck2-x86_64-unknown-linux-musl", "providers": [ { - "url": "https://github.com/facebook/buck2/releases/download/2026-01-19/buck2-x86_64-unknown-linux-musl.zst" + "url": "https://github.com/ben--/buck2/releases/download/latest/buck2-x86_64-unknown-linux-musl.zst" } ] } diff --git a/folly/BUCK b/folly/BUCK index 932adc3779b..c5ba5040c74 100644 --- a/folly/BUCK +++ b/folly/BUCK @@ -1350,7 +1350,7 @@ fb_dirsync_cpp_library( ] + select({ "DEFAULT": [], "antlir//antlir/distro:build-for-distro": ["third-party//binutils:iberty"], - "fbsource//xplat/folly:folly_demangle_macos_disable_iberty_config": [], + ":folly_demangle_macos_disable_iberty_config": [], "ovr_config//os:linux": ["fbsource//third-party/binutils:iberty-demangle"], "ovr_config//os:macos": ["fbsource//third-party/binutils:iberty-demangle"], "ovr_config//runtime:fbcode": ["third-party//binutils:iberty"], @@ -5960,9 +5960,9 @@ fbcode_target( exported_deps = [], ) -fb_native.export_file( - name = "src-tree", - src = ".", - mode = "reference", - visibility = ["PUBLIC"], -) +# @fb-only: fb_native.export_file( +# @fb-only: name = "src-tree", +# @fb-only: src = ".", +# @fb-only: mode = "reference", +# @fb-only: visibility = ["PUBLIC"], +# @fb-only: ) diff --git a/folly/buck_config/BUCK b/folly/buck_config/BUCK index 382c1faf917..457ce21def8 100644 --- a/folly/buck_config/BUCK +++ b/folly/buck_config/BUCK @@ -5,7 +5,7 @@ oncall("fbcode_entropy_wardens_folly") fb_native.config_setting( name = "folly-singleton-schedule-at-exit-disabled", constraint_values = [ - "fbsource//xplat/folly/buck_config/constraints:singleton-schedule-at-exit-disabled", + "//" + package_name() + "/constraints:singleton-schedule-at-exit-disabled", ], visibility = ["PUBLIC"], ) @@ -13,7 +13,7 @@ fb_native.config_setting( fb_native.config_setting( name = "folly-f14-fallback-disabled", constraint_values = [ - "fbsource//xplat/folly/buck_config/constraints:f14-fallback-disabled", + "//" + package_name() + "/constraints:f14-fallback-disabled", ], visibility = ["PUBLIC"], ) @@ -21,7 +21,7 @@ fb_native.config_setting( fb_native.config_setting( name = "folly-gflags-enabled", constraint_values = [ - "fbsource//xplat/folly/buck_config/constraints:gflags-enabled", + "//" + package_name() + "/constraints:gflags-enabled", ], visibility = ["PUBLIC"], ) diff --git a/folly/buck_config/constraints/BUCK b/folly/buck_config/constraints/BUCK index a55bf53d336..b76af49f1c6 100644 --- a/folly/buck_config/constraints/BUCK +++ b/folly/buck_config/constraints/BUCK @@ -3,40 +3,34 @@ load("@fbsource//tools/build_defs:fb_native_wrapper.bzl", "fb_native") oncall("fbcode_entropy_wardens_folly") -non_fbcode_target( - _kind = fb_native.constraint_setting, +fb_native.constraint_setting( name = "singleton", visibility = ["PUBLIC"], ) -non_fbcode_target( - _kind = fb_native.constraint_value, +fb_native.constraint_value( name = "singleton-schedule-at-exit-disabled", constraint_setting = ":singleton", visibility = ["PUBLIC"], ) -non_fbcode_target( - _kind = fb_native.constraint_setting, +fb_native.constraint_setting( name = "f14-fallback", visibility = ["PUBLIC"], ) -non_fbcode_target( - _kind = fb_native.constraint_value, +fb_native.constraint_value( name = "f14-fallback-disabled", constraint_setting = ":f14-fallback", visibility = ["PUBLIC"], ) -non_fbcode_target( - _kind = fb_native.constraint_setting, +fb_native.constraint_setting( name = "gflags", visibility = ["PUBLIC"], ) -non_fbcode_target( - _kind = fb_native.constraint_value, +fb_native.constraint_value( name = "gflags-enabled", constraint_setting = ":gflags", visibility = ["PUBLIC"], diff --git a/folly/cli/BUCK b/folly/cli/BUCK index 7509f5e70c4..45a178bd518 100644 --- a/folly/cli/BUCK +++ b/folly/cli/BUCK @@ -10,7 +10,7 @@ load( "MACOSX", "WINDOWS", ) -load("@fbsource//xplat/folly:defs.bzl", "folly_xplat_library") +load("../defs.bzl", "folly_xplat_library") oncall("fbcode_entropy_wardens_folly") diff --git a/folly/coro/BUCK b/folly/coro/BUCK index 38e125c76d3..52d5d469681 100644 --- a/folly/coro/BUCK +++ b/folly/coro/BUCK @@ -50,8 +50,8 @@ fbcode_target( "//folly/coro:base_promise", "//folly/coro:coroutine", "//folly/coro:current_executor", - "//folly/coro:detail_malloc", - "//folly/coro:detail_manual_lifetime", + "//folly/coro/detail:malloc", + "//folly/coro/detail:manual_lifetime", "//folly/coro:invoke", "//folly/coro:result", "//folly/coro:scope_exit", @@ -138,8 +138,8 @@ fbcode_target( exported_deps = [ ":coroutine", ":current_executor", - ":detail_barrier", - ":detail_barrier_task", + "//folly/coro/detail:barrier", + "//folly/coro/detail:barrier_task", ":task", "//folly:cancellation_token", "//folly:exception_wrapper", @@ -317,8 +317,8 @@ fbcode_target( exported_deps = [ "//folly:try", "//folly/coro:coroutine", - "//folly/coro:detail_malloc", - "//folly/coro:detail_traits", + "//folly/coro/detail:malloc", + "//folly/coro/detail:traits", "//folly/coro:task", "//folly/coro:traits", "//folly/coro:via_if_async", @@ -396,11 +396,11 @@ fbcode_target( "//folly/coro:async_pipe", "//folly/coro:async_scope", "//folly/coro:coroutine", - "//folly/coro:detail_barrier", - "//folly/coro:detail_barrier_task", - "//folly/coro:detail_current_async_frame", - "//folly/coro:detail_helpers", - "//folly/coro:detail_traits", + "//folly/coro/detail:barrier", + "//folly/coro/detail:barrier_task", + "//folly/coro/detail:current_async_frame", + "//folly/coro/detail:helpers", + "//folly/coro/detail:traits", "//folly/coro:mutex", "//folly/coro:task", "//folly/coro:via_if_async", @@ -531,7 +531,7 @@ fbcode_target( exported_deps = [ "//folly/coro:baton", "//folly/coro:coroutine", - "//folly/coro:detail_helpers", + "//folly/coro/detail:helpers", "//folly/coro:invoke", "//folly/coro:task", "//folly/coro:traits", @@ -554,176 +554,6 @@ non_fbcode_target( ### this line is a hint for source control merge -fbcode_target( - _kind = cpp_library, - name = "detail_barrier", - headers = ["detail/Barrier.h"], - exported_deps = [ - ":coroutine", - ":traits", - ":with_async_stack", - "//folly/tracing:async_stack", - ], -) - -non_fbcode_target( - _kind = folly_xplat_cxx_library, - name = "detail_barrier", - raw_headers = ["detail/Barrier.h"], - exported_deps = [ - "//xplat/folly/experimental/coro:coroutine", - "//xplat/folly/experimental/coro:traits", - "//xplat/folly/experimental/coro:with_async_stack", - "//xplat/folly/tracing:async_stack", - ], -) - -### this line is a hint for source control merge - -fbcode_target( - _kind = cpp_library, - name = "detail_barrier_task", - headers = ["detail/BarrierTask.h"], - exported_deps = [ - ":coroutine", - ":detail_barrier", - ":detail_malloc", - ":with_async_stack", - ], -) - -non_fbcode_target( - _kind = folly_xplat_cxx_library, - name = "detail_barrier_task", - raw_headers = ["detail/BarrierTask.h"], - exported_deps = [ - "//xplat/folly/experimental/coro:coroutine", - "//xplat/folly/experimental/coro:detail_barrier", - "//xplat/folly/experimental/coro:detail_malloc", - "//xplat/folly/experimental/coro:with_async_stack", - ], -) - -### this line is a hint for source control merge - -fbcode_target( - _kind = cpp_library, - name = "detail_current_async_frame", - headers = ["detail/CurrentAsyncFrame.h"], - exported_deps = [ - ":coroutine", - ":with_async_stack", - "//folly:executor", - "//folly/tracing:async_stack", - ], -) - -non_fbcode_target( - _kind = folly_xplat_cxx_library, - name = "detail_current_async_frame", - raw_headers = ["detail/CurrentAsyncFrame.h"], - exported_deps = [ - "//xplat/folly:executor", - "//xplat/folly/experimental/coro:coroutine", - "//xplat/folly/experimental/coro:with_async_stack", - "//xplat/folly/tracing:async_stack", - ], -) - -### this line is a hint for source control merge - -fbcode_target( - _kind = cpp_library, - name = "detail_helpers", - headers = ["detail/Helpers.h"], - exported_deps = [ - ":coroutine", - "//folly:executor", - "//folly:singleton_thread_local", - "//folly/io/async:request_context", - "//folly/tracing:async_stack", - ], -) - -non_fbcode_target( - _kind = folly_xplat_cxx_library, - name = "detail_helpers", - raw_headers = ["detail/Helpers.h"], - exported_deps = [ - "//xplat/folly:executor", - "//xplat/folly:singleton_thread_local", - "//xplat/folly/experimental/coro:coroutine", - "//xplat/folly/io/async:request_context", - "//xplat/folly/tracing:async_stack", - ], -) - -### this line is a hint for source control merge - -fbcode_target( - _kind = cpp_library, - name = "detail_malloc", - srcs = ["detail/Malloc.cpp"], - headers = ["detail/Malloc.h"], - deps = [ - "//folly/lang:hint", - "//folly/lang:new", - ], - exported_deps = [ - "//folly:c_portability", - ], -) - -non_fbcode_target( - _kind = folly_xplat_cxx_library, - name = "detail_malloc", - srcs = ["detail/Malloc.cpp"], - raw_headers = ["detail/Malloc.h"], - deps = [ - "//xplat/folly/lang:hint", - "//xplat/folly/lang:new", - ], - exported_deps = ["//xplat/folly:c_portability"], -) - -### this line is a hint for source control merge - -fbcode_target( - _kind = cpp_library, - name = "detail_manual_lifetime", - headers = ["detail/ManualLifetime.h"], - exported_deps = [ - "//folly:scope_guard", - ], -) - -non_fbcode_target( - _kind = folly_xplat_cxx_library, - name = "detail_manual_lifetime", - raw_headers = ["detail/ManualLifetime.h"], - exported_deps = ["//xplat/folly:scope_guard"], -) - -### this line is a hint for source control merge - -fbcode_target( - _kind = cpp_library, - name = "detail_traits", - headers = ["detail/Traits.h"], - exported_deps = [ - "//folly:traits", - ], -) - -non_fbcode_target( - _kind = folly_xplat_cxx_library, - name = "detail_traits", - raw_headers = ["detail/Traits.h"], - exported_deps = ["//xplat/folly:traits"], -) - -### this line is a hint for source control merge - fbcode_target( _kind = cpp_library, name = "error", @@ -890,38 +720,6 @@ non_fbcode_target( ### this line is a hint for source control merge -fbcode_target( - _kind = cpp_library, - name = "inline_task", - headers = ["detail/InlineTask.h"], - exported_deps = [ - ":coroutine", - ":detail_malloc", - ":with_async_stack", - "//folly:scope_guard", - "//folly:try", - "//folly/lang:assume", - "//folly/tracing:async_stack", - ], -) - -non_fbcode_target( - _kind = folly_xplat_cxx_library, - name = "inline_task", - raw_headers = ["detail/InlineTask.h"], - exported_deps = [ - "//xplat/folly:scope_guard", - "//xplat/folly:try", - "//xplat/folly/experimental/coro:coroutine", - "//xplat/folly/experimental/coro:detail_malloc", - "//xplat/folly/experimental/coro:with_async_stack", - "//xplat/folly/lang:assume", - "//xplat/folly/tracing:async_stack", - ], -) - -### this line is a hint for source control merge - fbcode_target( _kind = cpp_library, name = "invoke", @@ -958,10 +756,10 @@ fbcode_target( "//folly/coro:async_generator", "//folly/coro:baton", "//folly/coro:coroutine", - "//folly/coro:detail_barrier", - "//folly/coro:detail_barrier_task", - "//folly/coro:detail_current_async_frame", - "//folly/coro:detail_helpers", + "//folly/coro/detail:barrier", + "//folly/coro/detail:barrier_task", + "//folly/coro/detail:current_async_frame", + "//folly/coro/detail:helpers", "//folly/coro:mutex", "//folly/coro:task", "//folly/coro:via_if_async", @@ -1444,9 +1242,6 @@ fbcode_target( "//folly/coro:base_promise", "//folly/coro:coroutine", "//folly/coro:current_executor", - "//folly/coro:detail_malloc", - "//folly/coro:detail_traits", - "//folly/coro:inline_task", "//folly/coro:invoke", "//folly/coro:result", "//folly/coro:scope_exit", @@ -1454,6 +1249,9 @@ fbcode_target( "//folly/coro:via_if_async", "//folly/coro:with_async_stack", "//folly/coro:with_cancellation", + "//folly/coro/detail:inline_task", + "//folly/coro/detail:malloc", + "//folly/coro/detail:traits", "//folly/futures:core", "//folly/io/async:request_context", "//folly/lang:assume", @@ -1538,7 +1336,7 @@ fbcode_target( "//folly:optional", "//folly/coro:baton", "//folly/coro:coroutine", - "//folly/coro:detail_helpers", + "//folly/coro/detail:helpers", "//folly/coro:invoke", "//folly/coro:task", "//folly/coro:traits", @@ -1746,7 +1544,7 @@ fbcode_target( "//folly:executor", "//folly:traits", "//folly/coro:coroutine", - "//folly/coro:detail_malloc", + "//folly/coro/detail:malloc", "//folly/coro:traits", "//folly/coro:with_async_stack", "//folly/coro:with_cancellation", diff --git a/folly/coro/detail/BUCK b/folly/coro/detail/BUCK index 8aa6f619042..4d0e0ee67bb 100644 --- a/folly/coro/detail/BUCK +++ b/folly/coro/detail/BUCK @@ -1,6 +1,8 @@ load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target") load("@fbcode_macros//build_defs:cpp_library.bzl", "cpp_library") -load("@fbsource//xplat/folly:defs.bzl", "folly_xplat_cxx_library") +load("@fbsource//xplat/pfh/triage_InfrastructureSupermoduleOptou:DEFS.bzl", "triage_InfrastructureSupermoduleOptou") +load("//folly:defs.bzl", "folly_xplat_cxx_library") +load("../../defs.bzl", "folly_xplat_cxx_library") oncall("fbcode_entropy_wardens_folly") @@ -25,3 +27,205 @@ non_fbcode_target( "//xplat/folly/lang:safe_alias_fwd", ], ) + +### this line is a hint for source control merge + +fbcode_target( + _kind = cpp_library, + name = "barrier", + headers = ["Barrier.h"], + exported_deps = [ + "//folly/coro:coroutine", + "//folly/coro:traits", + "//folly/coro:with_async_stack", + "//folly/tracing:async_stack", + ], +) + +non_fbcode_target( + _kind = folly_xplat_cxx_library, + name = "barrier", + raw_headers = ["Barrier.h"], + exported_deps = [ + "//xplat/folly/experimental/coro:coroutine", + "//xplat/folly/experimental/coro:traits", + "//xplat/folly/experimental/coro:with_async_stack", + "//xplat/folly/tracing:async_stack", + ], +) + +### this line is a hint for source control merge + +fbcode_target( + _kind = cpp_library, + name = "barrier_task", + headers = ["BarrierTask.h"], + exported_deps = [ + ":barrier", + ":malloc", + "//folly/coro:coroutine", + "//folly/coro:with_async_stack", + ], +) + +non_fbcode_target( + _kind = folly_xplat_cxx_library, + name = "barrier_task", + raw_headers = ["BarrierTask.h"], + exported_deps = [ + ":barrier", + ":malloc", + "//xplat/folly/experimental/coro:coroutine", + "//xplat/folly/experimental/coro:with_async_stack", + ], +) + +### this line is a hint for source control merge + +fbcode_target( + _kind = cpp_library, + name = "current_async_frame", + headers = ["CurrentAsyncFrame.h"], + exported_deps = [ + "//folly:executor", + "//folly/coro:coroutine", + "//folly/coro:with_async_stack", + "//folly/tracing:async_stack", + ], +) + +non_fbcode_target( + _kind = folly_xplat_cxx_library, + name = "current_async_frame", + raw_headers = ["CurrentAsyncFrame.h"], + exported_deps = [ + "//xplat/folly:executor", + "//xplat/folly/experimental/coro:coroutine", + "//xplat/folly/experimental/coro:with_async_stack", + "//xplat/folly/tracing:async_stack", + ], +) + +### this line is a hint for source control merge + +fbcode_target( + _kind = cpp_library, + name = "helpers", + headers = ["Helpers.h"], + exported_deps = [ + "//folly:executor", + "//folly:singleton_thread_local", + "//folly/coro:coroutine", + "//folly/io/async:request_context", + "//folly/tracing:async_stack", + ], +) + +non_fbcode_target( + _kind = folly_xplat_cxx_library, + name = "helpers", + raw_headers = ["Helpers.h"], + exported_deps = [ + "//xplat/folly:executor", + "//xplat/folly:singleton_thread_local", + "//xplat/folly/experimental/coro:coroutine", + "//xplat/folly/io/async:request_context", + "//xplat/folly/tracing:async_stack", + ], +) + +### this line is a hint for source control merge + +fbcode_target( + _kind = cpp_library, + name = "inline_task", + headers = ["InlineTask.h"], + exported_deps = [ + ":malloc", + "//folly:scope_guard", + "//folly:try", + "//folly/coro:coroutine", + "//folly/coro:with_async_stack", + "//folly/lang:assume", + "//folly/tracing:async_stack", + ], +) + +non_fbcode_target( + _kind = folly_xplat_cxx_library, + name = "inline_task", + raw_headers = ["InlineTask.h"], + exported_deps = [ + "//xplat/folly:scope_guard", + "//xplat/folly:try", + "//xplat/folly/experimental/coro:coroutine", + "//xplat/folly/experimental/coro:detail_malloc", + "//xplat/folly/experimental/coro:with_async_stack", + "//xplat/folly/lang:assume", + "//xplat/folly/tracing:async_stack", + ], +) + +### this line is a hint for source control merge + +fbcode_target( + _kind = cpp_library, + name = "malloc", + srcs = ["Malloc.cpp"], + headers = ["Malloc.h"], + deps = [ + "//folly/lang:hint", + "//folly/lang:new", + ], + exported_deps = [ + "//folly:c_portability", + ], +) + +non_fbcode_target( + _kind = folly_xplat_cxx_library, + name = "malloc", + srcs = ["Malloc.cpp"], + raw_headers = ["Malloc.h"], + deps = [ + "//xplat/folly/lang:hint", + "//xplat/folly/lang:new", + ], + exported_deps = ["//xplat/folly:c_portability"], +) + +### this line is a hint for source control merge + +fbcode_target( + _kind = cpp_library, + name = "manual_lifetime", + headers = ["ManualLifetime.h"], + exported_deps = [ + "//folly:scope_guard", + ], +) + +non_fbcode_target( + _kind = folly_xplat_cxx_library, + name = "manual_lifetime", + raw_headers = ["ManualLifetime.h"], + exported_deps = ["//xplat/folly:scope_guard"], +) + +### this line is a hint for source control merge + +fbcode_target( + _kind = cpp_library, + name = "traits", + headers = ["Traits.h"], + exported_deps = [ + "//folly:traits", + ], +) + +non_fbcode_target( + _kind = folly_xplat_cxx_library, + name = "traits", + raw_headers = ["Traits.h"], + exported_deps = ["//xplat/folly:traits"], +) diff --git a/folly/coro/test/BUCK b/folly/coro/test/BUCK index 5be35a7f239..630ff6ec5f7 100644 --- a/folly/coro/test/BUCK +++ b/folly/coro/test/BUCK @@ -180,7 +180,6 @@ fbcode_target( "//folly/coro:future_util", "//folly/coro:generator", "//folly/coro:gtest_helpers", - "//folly/coro:inline_task", "//folly/coro:invoke", "//folly/coro:merge", "//folly/coro:mutex", @@ -196,6 +195,7 @@ fbcode_target( "//folly/coro:unbounded_queue", "//folly/coro:value_or_error", "//folly/coro:with_cancellation", + "//folly/coro/detail:inline_task", "//folly/coro/safe:captures", "//folly/coro/safe:now_task", "//folly/executors:cpu_thread_pool_executor", @@ -304,10 +304,10 @@ fbcode_target( name = "with_async_stack_test", srcs = ["WithAsyncStackTest.cpp"], deps = [ - "//folly/coro:detail_current_async_frame", "//folly/coro:gtest_helpers", "//folly/coro:traits", "//folly/coro:with_async_stack", + "//folly/coro/detail:current_async_frame", "//folly/coro/safe:now_task", ], ) diff --git a/folly/debugging/symbolizer/BUCK b/folly/debugging/symbolizer/BUCK index df124470b55..9e76ba8ff65 100644 --- a/folly/debugging/symbolizer/BUCK +++ b/folly/debugging/symbolizer/BUCK @@ -1,6 +1,6 @@ load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target") load("@fbcode_macros//build_defs:cpp_library.bzl", "cpp_library") -load("@fbsource//xplat/folly:defs.bzl", "folly_xplat_library") +load("../../defs.bzl", "folly_xplat_library") oncall("fbcode_entropy_wardens_folly") diff --git a/folly/debugging/symbolizer/detail/BUCK b/folly/debugging/symbolizer/detail/BUCK index d862af99201..67b824bcd3f 100644 --- a/folly/debugging/symbolizer/detail/BUCK +++ b/folly/debugging/symbolizer/detail/BUCK @@ -1,6 +1,6 @@ load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target") load("@fbcode_macros//build_defs:cpp_library.bzl", "cpp_library") -load("@fbsource//xplat/folly:defs.bzl", "folly_xplat_library") +load("../../../defs.bzl", "folly_xplat_library") oncall("fbcode_entropy_wardens_folly") diff --git a/folly/debugging/symbolizer/tool/BUCK b/folly/debugging/symbolizer/tool/BUCK index a525c752e37..f3a4b6fff9e 100644 --- a/folly/debugging/symbolizer/tool/BUCK +++ b/folly/debugging/symbolizer/tool/BUCK @@ -69,7 +69,6 @@ fbcode_target( }), ), ], - target_compatible_with = ["fbcode//opensource/macros:broken-in-oss"], deps = [ "//folly:range", "//folly/debugging/symbolizer:signal_handler", diff --git a/folly/docs/BUCK b/folly/docs/BUCK index 0f343788348..5bdac2f2bc8 100644 --- a/folly/docs/BUCK +++ b/folly/docs/BUCK @@ -1,5 +1,5 @@ load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target") -load("@fbsource//xplat/folly/docs:defs.bzl", "copy", "html") +load(":defs.bzl", "copy", "html") # # Actual listing of source files diff --git a/folly/executors/task_queue/BUCK b/folly/executors/task_queue/BUCK index 974b5869eea..0b5da81261d 100644 --- a/folly/executors/task_queue/BUCK +++ b/folly/executors/task_queue/BUCK @@ -1,11 +1,7 @@ load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target") load("@fbcode_macros//build_defs:cpp_library.bzl", "cpp_library") load("@fbsource//tools/build_defs/dirsync:fb_dirsync_cpp_library.bzl", "fb_dirsync_cpp_library") -load("@fbsource//xplat/folly:defs.bzl", "folly_xplat_cxx_library") -load( - "../../defs.bzl", - "folly_xplat_library", -) +load("../../defs.bzl", "folly_xplat_cxx_library", "folly_xplat_library") oncall("fbcode_entropy_wardens_folly") diff --git a/folly/experimental/BUCK b/folly/experimental/BUCK index 593ebf3e33b..0bbb35e0f34 100644 --- a/folly/experimental/BUCK +++ b/folly/experimental/BUCK @@ -1,6 +1,6 @@ load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target") load("@fbcode_macros//build_defs:cpp_library.bzl", "cpp_library") -load("@fbsource//xplat/folly:defs.bzl", "folly_xplat_library") +load("../defs.bzl", "folly_xplat_library") oncall("fbcode_entropy_wardens_folly") diff --git a/folly/experimental/coro/BUCK b/folly/experimental/coro/BUCK index 3d2e0358178..dc11a0607c7 100644 --- a/folly/experimental/coro/BUCK +++ b/folly/experimental/coro/BUCK @@ -130,7 +130,7 @@ non_fbcode_target( name = "detail_barrier", raw_headers = ["detail/Barrier.h"], exported_deps = [ - "//xplat/folly/coro:detail_barrier", + "//xplat/folly/coro/detail:barrier", ], ) @@ -139,7 +139,7 @@ non_fbcode_target( name = "detail_barrier_task", raw_headers = ["detail/BarrierTask.h"], exported_deps = [ - "//xplat/folly/coro:detail_barrier_task", + "//xplat/folly/coro/detail:barrier_task", ], ) @@ -148,7 +148,7 @@ non_fbcode_target( name = "detail_current_async_frame", raw_headers = ["detail/CurrentAsyncFrame.h"], exported_deps = [ - "//xplat/folly/coro:detail_current_async_frame", + "//xplat/folly/coro/detail:current_async_frame", ], ) @@ -157,7 +157,7 @@ non_fbcode_target( name = "detail_helpers", raw_headers = ["detail/Helpers.h"], exported_deps = [ - "//xplat/folly/coro:detail_helpers", + "//xplat/folly/coro/detail:helpers", ], ) @@ -166,7 +166,7 @@ non_fbcode_target( name = "detail_malloc", raw_headers = ["detail/Malloc.h"], exported_deps = [ - "//xplat/folly/coro:detail_malloc", + "//xplat/folly/coro/detail:malloc", ], ) @@ -175,7 +175,7 @@ non_fbcode_target( name = "detail_manual_lifetime", raw_headers = ["detail/ManualLifetime.h"], exported_deps = [ - "//xplat/folly/coro:detail_manual_lifetime", + "//xplat/folly/coro/detail:manual_lifetime", ], ) @@ -184,7 +184,7 @@ non_fbcode_target( name = "detail_traits", raw_headers = ["detail/Traits.h"], exported_deps = [ - "//xplat/folly/coro:detail_traits", + "//xplat/folly/coro/detail:traits", ], ) @@ -241,7 +241,7 @@ non_fbcode_target( name = "inline_task", raw_headers = ["detail/InlineTask.h"], exported_deps = [ - "//xplat/folly/coro:inline_task", + "//xplat/folly/coro/detail:inline_task", ], ) @@ -620,7 +620,7 @@ fbcode_target( "detail/Barrier.h", ], exported_deps = [ - "//folly/coro:detail_barrier", + "//folly/coro/detail:barrier", ], ) @@ -631,7 +631,7 @@ fbcode_target( "detail/BarrierTask.h", ], exported_deps = [ - "//folly/coro:detail_barrier_task", + "//folly/coro/detail:barrier_task", ], ) @@ -642,7 +642,7 @@ fbcode_target( "detail/CurrentAsyncFrame.h", ], exported_deps = [ - "//folly/coro:detail_current_async_frame", + "//folly/coro/detail:current_async_frame", ], ) @@ -653,7 +653,7 @@ fbcode_target( "detail/Helpers.h", ], exported_deps = [ - "//folly/coro:detail_helpers", + "//folly/coro/detail:helpers", ], ) @@ -664,7 +664,7 @@ fbcode_target( "detail/Malloc.h", ], exported_deps = [ - "//folly/coro:detail_malloc", + "//folly/coro/detail:malloc", ], ) @@ -675,7 +675,7 @@ fbcode_target( "detail/ManualLifetime.h", ], exported_deps = [ - "//folly/coro:detail_manual_lifetime", + "//folly/coro/detail:manual_lifetime", ], ) @@ -686,7 +686,7 @@ fbcode_target( "detail/Traits.h", ], exported_deps = [ - "//folly/coro:detail_traits", + "//folly/coro/detail:traits", ], ) @@ -753,7 +753,7 @@ fbcode_target( "detail/InlineTask.h", ], exported_deps = [ - "//folly/coro:inline_task", + "//folly/coro/detail:inline_task", ], ) diff --git a/folly/experimental/settings/BUCK b/folly/experimental/settings/BUCK index 4989c2cd2ca..35565dff2a8 100644 --- a/folly/experimental/settings/BUCK +++ b/folly/experimental/settings/BUCK @@ -1,6 +1,6 @@ load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target") load("@fbcode_macros//build_defs:cpp_library.bzl", "cpp_library") -load("@fbsource//xplat/folly:defs.bzl", "folly_xplat_library") +load("../../defs.bzl", "folly_xplat_library") oncall("fbcode_entropy_wardens_folly") diff --git a/folly/experimental/symbolizer/BUCK b/folly/experimental/symbolizer/BUCK index fb7c1f96c61..7ee0503057e 100644 --- a/folly/experimental/symbolizer/BUCK +++ b/folly/experimental/symbolizer/BUCK @@ -1,6 +1,6 @@ load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target") load("@fbcode_macros//build_defs:cpp_library.bzl", "cpp_library") -load("@fbsource//xplat/folly:defs.bzl", "folly_xplat_library") +load("../../defs.bzl", "folly_xplat_library") oncall("fbcode_entropy_wardens_folly") diff --git a/folly/experimental/symbolizer/detail/BUCK b/folly/experimental/symbolizer/detail/BUCK index dee34560b99..29191fe4bd2 100644 --- a/folly/experimental/symbolizer/detail/BUCK +++ b/folly/experimental/symbolizer/detail/BUCK @@ -1,6 +1,6 @@ load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target") load("@fbcode_macros//build_defs:cpp_library.bzl", "cpp_library") -load("@fbsource//xplat/folly:defs.bzl", "folly_xplat_library") +load("../../../defs.bzl", "folly_xplat_library") oncall("fbcode_entropy_wardens_folly") diff --git a/folly/functional/BUCK b/folly/functional/BUCK index d1a1fa4dd29..8ecc0e0224d 100644 --- a/folly/functional/BUCK +++ b/folly/functional/BUCK @@ -1,5 +1,5 @@ load("@fbsource//tools/build_defs/dirsync:fb_dirsync_cpp_library.bzl", "fb_dirsync_cpp_library") -load("@fbsource//xplat/folly:defs.bzl", "folly_xplat_library") +load("../defs.bzl", "folly_xplat_library") oncall("fbcode_entropy_wardens_folly") diff --git a/folly/functional/test/BUCK b/folly/functional/test/BUCK index ca6b7018201..2410a5fbd96 100644 --- a/folly/functional/test/BUCK +++ b/folly/functional/test/BUCK @@ -1,6 +1,6 @@ load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target") load("@fbcode_macros//build_defs:cpp_unittest.bzl", "cpp_unittest") -load("@fbsource//xplat/folly:defs.bzl", "folly_xplat_cxx_test") +load("../../defs.bzl", "folly_xplat_cxx_test") oncall("fbcode_entropy_wardens_folly") diff --git a/folly/futures/BUCK b/folly/futures/BUCK index f93a2ed01c9..0f03e9af4ee 100644 --- a/folly/futures/BUCK +++ b/folly/futures/BUCK @@ -1,6 +1,6 @@ load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target") load("@fbcode_macros//build_defs:cpp_library.bzl", "cpp_library") -load("@fbsource//xplat/folly:defs.bzl", "folly_xplat_library") +load("../defs.bzl", "folly_xplat_library") oncall("fbcode_entropy_wardens_folly") diff --git a/folly/futures/detail/BUCK b/folly/futures/detail/BUCK index 498e255ad93..fc886e88a35 100644 --- a/folly/futures/detail/BUCK +++ b/folly/futures/detail/BUCK @@ -1,6 +1,6 @@ load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target") load("@fbcode_macros//build_defs:cpp_library.bzl", "cpp_library") -load("@fbsource//xplat/folly:defs.bzl", "folly_xplat_library") +load("../../defs.bzl", "folly_xplat_library") oncall("fbcode_entropy_wardens_folly") diff --git a/folly/gen/BUCK b/folly/gen/BUCK index 4de53b24bdd..a16f6f3e158 100644 --- a/folly/gen/BUCK +++ b/folly/gen/BUCK @@ -1,10 +1,6 @@ load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target") load("@fbcode_macros//build_defs:cpp_library.bzl", "cpp_library") -load( - "@fbsource//xplat/folly:defs.bzl", - "DEFAULT_APPLE_SDKS", - "folly_xplat_library", -) +load("../defs.bzl", "DEFAULT_APPLE_SDKS", "folly_xplat_library") oncall("fbcode_entropy_wardens_folly") diff --git a/folly/hash/BUCK b/folly/hash/BUCK index 2a07042ec2e..1d56ad7845f 100644 --- a/folly/hash/BUCK +++ b/folly/hash/BUCK @@ -1,7 +1,7 @@ load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target") load("@fbcode_macros//build_defs:cpp_library.bzl", "cpp_library") load("@fbsource//tools/build_defs/dirsync:fb_dirsync_cpp_library.bzl", "fb_dirsync_cpp_library") -load("@fbsource//xplat/folly:defs.bzl", "folly_xplat_cxx_library", "folly_xplat_library") +load("../defs.bzl", "folly_xplat_cxx_library", "folly_xplat_library") oncall("fbcode_entropy_wardens_folly") diff --git a/folly/hash/detail/BUCK b/folly/hash/detail/BUCK index faae1215961..7657d877673 100644 --- a/folly/hash/detail/BUCK +++ b/folly/hash/detail/BUCK @@ -1,9 +1,6 @@ load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target") load("@fbcode_macros//build_defs:cpp_library.bzl", "cpp_library") -load( - "@fbsource//xplat/folly:defs.bzl", - "folly_xplat_library", -) +load("../../defs.bzl", "folly_xplat_library") oncall("fbcode_entropy_wardens_folly") diff --git a/folly/lang/BUCK b/folly/lang/BUCK index ac94addc389..acf1b21dea1 100644 --- a/folly/lang/BUCK +++ b/folly/lang/BUCK @@ -1,7 +1,7 @@ load("@bazel_skylib//lib:selects.bzl", "selects") load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target") load("@fbcode_macros//build_defs:cpp_library.bzl", "cpp_library") -load("@fbsource//xplat/folly:defs.bzl", "folly_xplat_cxx_library") +load("../defs.bzl", "folly_xplat_cxx_library") oncall("fbcode_entropy_wardens_folly") diff --git a/folly/logging/BUCK b/folly/logging/BUCK index 67b39a8b9d4..853b722f874 100644 --- a/folly/logging/BUCK +++ b/folly/logging/BUCK @@ -1,6 +1,6 @@ load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target") load("@fbcode_macros//build_defs:cpp_library.bzl", "cpp_library") -load("@fbsource//xplat/folly:defs.bzl", "folly_xplat_library") +load("../defs.bzl", "folly_xplat_library") oncall("fbcode_entropy_wardens_folly") diff --git a/folly/logging/example/BUCK b/folly/logging/example/BUCK index 1e15001b7b3..071ae6e9b42 100644 --- a/folly/logging/example/BUCK +++ b/folly/logging/example/BUCK @@ -1,7 +1,7 @@ load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target") load("@fbcode_macros//build_defs:cpp_binary.bzl", "cpp_binary") load("@fbcode_macros//build_defs:cpp_library.bzl", "cpp_library") -load("@fbsource//xplat/folly:defs.bzl", "folly_xplat_library") +load("../../defs.bzl", "folly_xplat_library") oncall("fbcode_entropy_wardens_folly") diff --git a/folly/logging/test/BUCK b/folly/logging/test/BUCK index ce7b92c8113..448e78eda82 100644 --- a/folly/logging/test/BUCK +++ b/folly/logging/test/BUCK @@ -4,7 +4,7 @@ load("@fbcode_macros//build_defs:cpp_library.bzl", "cpp_library") load("@fbcode_macros//build_defs:cpp_unittest.bzl", "cpp_unittest") load("@fbcode_macros//build_defs:python_unittest.bzl", "python_unittest") load("@fbsource//tools/build_defs/dirsync:fb_dirsync_cpp_library.bzl", "fb_dirsync_cpp_library") -load("@fbsource//xplat/folly:defs.bzl", "folly_xplat_library") +load("../../defs.bzl", "folly_xplat_library") oncall("fbcode_entropy_wardens_folly") diff --git a/folly/portability/BUCK b/folly/portability/BUCK index 0ed27bff188..11d319d0ad0 100644 --- a/folly/portability/BUCK +++ b/folly/portability/BUCK @@ -6,12 +6,7 @@ load( "MACOSX", "WATCHOS", ) -load( - "@fbsource//xplat/folly:defs.bzl", - "WINDOWS_CLANG_CXX_FLAGS", - "folly_xplat_library", - "should_enable_gflags", -) +load("../defs.bzl", "WINDOWS_CLANG_CXX_FLAGS", "folly_xplat_library", "should_enable_gflags") oncall("fbcode_entropy_wardens_folly") diff --git a/folly/portability/provide/BUCK b/folly/portability/provide/BUCK index bf167f1980d..16727981e71 100644 --- a/folly/portability/provide/BUCK +++ b/folly/portability/provide/BUCK @@ -1,6 +1,6 @@ load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target") load("@fbcode_macros//build_defs:cpp_library.bzl", "cpp_library") -load("@fbsource//xplat/folly:defs.bzl", "folly_xplat_library") +load("../../defs.bzl", "folly_xplat_library") oncall("fbcode_entropy_wardens_folly") diff --git a/folly/python/BUCK b/folly/python/BUCK index c8dab3c2c52..38fe97135a0 100644 --- a/folly/python/BUCK +++ b/folly/python/BUCK @@ -725,7 +725,6 @@ fbcode_target( "DEFAULT": None, "ovr_config//os:windows": "shared", }), - target_compatible_with = ["fbcode//opensource/macros:broken-in-oss"], deps = [ ":import", ], @@ -795,7 +794,6 @@ fbcode_target( ], # TODO(T36778537): Cython-generated `*_api.h` headers aren't modular. modular_headers = False, - target_compatible_with = ["fbcode//opensource/macros:broken-in-oss"], deps = [ ":import", ], diff --git a/folly/python/test/BUCK b/folly/python/test/BUCK index 0307014ed38..1978c949135 100644 --- a/folly/python/test/BUCK +++ b/folly/python/test/BUCK @@ -295,7 +295,6 @@ fbcode_target( name = "iobuf_test_utils", srcs = ["IOBufTestUtils.cpp"], headers = ["IOBufTestUtils.h"], - target_compatible_with = ["fbcode//opensource/macros:broken-in-oss"], deps = [ "//folly/executors:global_executor", "//folly/python:iobuf_ext", diff --git a/folly/rust/dynamic/BUCK b/folly/rust/dynamic/BUCK index de4607384fe..93777809991 100644 --- a/folly/rust/dynamic/BUCK +++ b/folly/rust/dynamic/BUCK @@ -13,7 +13,7 @@ fbcode_target( cxx_bridge = "dynamic.rs", deps = [ "fbsource//third-party/rust:cxx", - "//common/rust/folly/string:string", + "//folly/rust/string:string", ], ) diff --git a/folly/rust/iobuf/BUCK b/folly/rust/iobuf/BUCK index c61a733f94b..1303492615d 100644 --- a/folly/rust/iobuf/BUCK +++ b/folly/rust/iobuf/BUCK @@ -78,15 +78,15 @@ fb_xplat_cxx_library( "fbcode//folly/rust/iobuf/...", "fbsource//xplat/folly/rust/iobuf/...", ], - exported_deps = [ - "fbsource//xplat/folly/io:iobuf" if is_xplat() else "fbcode//folly/io:iobuf", - ], + # exported_deps = [ + # "fbsource//xplat/folly/io:iobuf" if is_xplat() else "fbcode//folly/io:iobuf", + # ], ) fb_xplat_rust_library( name = "_iobuf", srcs = glob(["src/*.rs"]), - cpp_deps = [":_iobuf-ffi"], + # cpp_deps = [":_iobuf-ffi"], crate = "iobuf", crate_root = "src/lib.rs", cxx_bridge = "src/lib.rs", @@ -104,7 +104,7 @@ fb_xplat_rust_library( "fbsource//third-party/rust:bytes", "fbsource//third-party/rust:cxx", "fbsource//third-party/rust:memmap2", - "fbsource//xplat/thrift/lib/rust:fbthrift", + # "fbsource//xplat/thrift/lib/rust:fbthrift", ":iobuf-sys", ], ) diff --git a/folly/stats/BUCK b/folly/stats/BUCK index a6450405333..d42e43a9c07 100644 --- a/folly/stats/BUCK +++ b/folly/stats/BUCK @@ -1,6 +1,6 @@ load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target") load("@fbcode_macros//build_defs:cpp_library.bzl", "cpp_library") -load("@fbsource//xplat/folly:defs.bzl", "folly_xplat_library") +load("../defs.bzl", "folly_xplat_library") oncall("fbcode_entropy_wardens_folly") diff --git a/folly/stats/detail/BUCK b/folly/stats/detail/BUCK index d12becc2959..d24f2814d9f 100644 --- a/folly/stats/detail/BUCK +++ b/folly/stats/detail/BUCK @@ -1,6 +1,6 @@ load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target") load("@fbcode_macros//build_defs:cpp_library.bzl", "cpp_library") -load("@fbsource//xplat/folly:defs.bzl", "folly_xplat_library") +load("../../defs.bzl", "folly_xplat_library") oncall("fbcode_entropy_wardens_folly") diff --git a/folly/synchronization/detail/BUCK b/folly/synchronization/detail/BUCK index 606571c2f93..013d678108b 100644 --- a/folly/synchronization/detail/BUCK +++ b/folly/synchronization/detail/BUCK @@ -1,6 +1,6 @@ load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target") load("@fbcode_macros//build_defs:cpp_library.bzl", "cpp_library") -load("@fbsource//xplat/folly:defs.bzl", "folly_xplat_library") +load("../../defs.bzl", "folly_xplat_library") oncall("fbcode_entropy_wardens_folly") diff --git a/folly/synchronization/example/BUCK b/folly/synchronization/example/BUCK index ebe6969f3c6..1f3fca0b919 100644 --- a/folly/synchronization/example/BUCK +++ b/folly/synchronization/example/BUCK @@ -1,6 +1,6 @@ load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target") load("@fbcode_macros//build_defs:cpp_library.bzl", "cpp_library") -load("@fbsource//xplat/folly:defs.bzl", "folly_xplat_library") +load("../../defs.bzl", "folly_xplat_library") oncall("fbcode_entropy_wardens_folly") diff --git a/folly/system/BUCK b/folly/system/BUCK index 062eef991ec..5d6406b60e1 100644 --- a/folly/system/BUCK +++ b/folly/system/BUCK @@ -1,6 +1,6 @@ load("@fbsource//tools/build_defs/dirsync:fb_dirsync_cpp_library.bzl", "fb_dirsync_cpp_library") -load("@fbsource//xplat/folly:defs.bzl", "folly_xplat_library") load("@fbsource//xplat/pfh/triage_InfrastructureSupermoduleOptou:DEFS.bzl", "triage_InfrastructureSupermoduleOptou") +load("../defs.bzl", "folly_xplat_library") oncall("fbcode_entropy_wardens_folly") diff --git a/folly/system/arch/BUCK b/folly/system/arch/BUCK index ab7ca251f07..54bac6c1ca4 100644 --- a/folly/system/arch/BUCK +++ b/folly/system/arch/BUCK @@ -1,6 +1,6 @@ load("@fbsource//tools/build_defs/dirsync:fb_dirsync_cpp_library.bzl", "fb_dirsync_cpp_library") -load("@fbsource//xplat/folly:defs.bzl", "folly_xplat_library") load("@fbsource//xplat/pfh/triage_InfrastructureSupermoduleOptou:DEFS.bzl", "triage_InfrastructureSupermoduleOptou") +load("../../defs.bzl", "folly_xplat_library") oncall("fbcode_entropy_wardens_folly") diff --git a/folly/system/test/BUCK b/folly/system/test/BUCK index d0ebf7d7528..5011518be30 100644 --- a/folly/system/test/BUCK +++ b/folly/system/test/BUCK @@ -1,6 +1,6 @@ load("@fbsource//tools/build_defs/dirsync:fb_dirsync_cpp_unittest.bzl", "fb_dirsync_cpp_unittest") -load("@fbsource//xplat/folly:defs.bzl", "folly_xplat_cxx_test") load("@fbsource//xplat/pfh/triage_InfrastructureSupermoduleOptou:DEFS.bzl", "triage_InfrastructureSupermoduleOptou") +load("../../defs.bzl", "folly_xplat_cxx_test") oncall("fbcode_entropy_wardens_folly") diff --git a/folly/testing/BUCK b/folly/testing/BUCK index 12702873555..7b5631ee408 100644 --- a/folly/testing/BUCK +++ b/folly/testing/BUCK @@ -1,6 +1,6 @@ load("@fbcode_macros//build_defs:build_file_migration.bzl", "fbcode_target", "non_fbcode_target") load("@fbcode_macros//build_defs:cpp_library.bzl", "cpp_library") -load("@fbsource//xplat/folly:defs.bzl", "folly_xplat_library") +load("../defs.bzl", "folly_xplat_library") oncall("fbcode_entropy_wardens_folly")