Re-sync with internal repository

The internal and external repositories are out of sync. This Pull Request attempts to brings them back in sync by patching the GitHub repository. Please carefully review this patch. You must disable ShipIt for your project in order to merge this pull request. DO NOT IMPORT this pull request. Instead, merge it directly on GitHub using the MERGE BUTTON. Re-enable ShipIt after merging.

app/buck2/BUCK

@@ -1,5 +1,5 @@
 load("@fbcode//buck2:buck_rust_binary.bzl", "buck_rust_binary")
-# @oss-disable: load("@fbcode_macros//build_defs:platform_utils.bzl", "platform_utils") 
+# @oss-disable[end= ]: load("@fbcode_macros//build_defs:platform_utils.bzl", "platform_utils")
 load("@fbcode_macros//build_defs:rust_library.bzl", "rust_library")
 load(":transition.bzl", "buck2_client_transition_alias")
 

app/buck2_build_info/BUCK

@@ -7,6 +7,6 @@ rust_library(
     srcs = glob(["src/**/*.rs"]),
     deps = [
         "//buck2/app/buck2_util:buck2_util",
-        # @oss-disable: "//common/rust/build_info:build_info", 
+        # @oss-disable[end= ]: "//common/rust/build_info:build_info",
     ],
 )

app/buck2_certs/BUCK

@@ -15,9 +15,9 @@ rust_library(
         "fbsource//third-party/rust:x509-parser",
         "//buck2/app/buck2_error:buck2_error",
         "//buck2/app/buck2_util:buck2_util",
-        # @oss-disable: "//buck2/facebook/find_certs:find_certs", 
+        # @oss-disable[end= ]: "//buck2/facebook/find_certs:find_certs",
         "//buck2/gazebo/dupe:dupe",
         "//buck2/gazebo/gazebo:gazebo",
-        # @oss-disable: "//common/rust/cpe:cpe", 
+        # @oss-disable[end= ]: "//common/rust/cpe:cpe",
     ],
 )

app/buck2_client_ctx/BUCK

@@ -84,7 +84,7 @@ rust_library(
         "//buck2/gazebo/dupe:dupe",
         "//buck2/gazebo/gazebo:gazebo",
         "//buck2/superconsole:superconsole",
-        # @oss-disable: "//common/rust/shed/detect_eden:detect_eden", 
+        # @oss-disable[end= ]: "//common/rust/shed/detect_eden:detect_eden",
         "//common/rust/shed/fbinit:fbinit",
     ],
 )

app/buck2_common/BUCK

@@ -80,15 +80,15 @@ rust_library(
         "//buck2/app/buck2_util:buck2_util",
         "//buck2/app/buck2_wrapper_common:buck2_wrapper_common",
         "//buck2/dice/dice:dice",
-        # @oss-disable: "//buck2/facebook/allocator-stats:allocator-stats", 
+        # @oss-disable[end= ]: "//buck2/facebook/allocator-stats:allocator-stats",
         "//buck2/gazebo/cmp_any:cmp_any",
         "//buck2/gazebo/dupe:dupe",
         "//buck2/gazebo/gazebo:gazebo",
         "//buck2/starlark-rust/starlark_map:starlark_map",
-        # @oss-disable: "//common/rust/folly/logging:logging", 
-        # @oss-disable: "//common/rust/folly/memory:memory", 
-        # @oss-disable: "//common/rust/gflags:gflags", 
+        # @oss-disable[end= ]: "//common/rust/folly/logging:logging",
+        # @oss-disable[end= ]: "//common/rust/folly/memory:memory",
+        # @oss-disable[end= ]: "//common/rust/gflags:gflags",
         "//common/rust/shed/fbinit:fbinit",
-        # @oss-disable: "//common/rust/shed/hostcaps:hostcaps", 
+        # @oss-disable[end= ]: "//common/rust/shed/hostcaps:hostcaps",
     ],
 )

app/buck2_daemon/BUCK

@@ -42,6 +42,6 @@ rust_library(
         "//buck2/app/buck2_util:buck2_util",
         "//buck2/dice/dice:dice",
         "//buck2/gazebo/dupe:dupe",
-        # @oss-disable: "//common/rust/gflags:gflags", 
+        # @oss-disable[end= ]: "//common/rust/gflags:gflags",
     ],
 )

app/buck2_eden/BUCK

@@ -6,28 +6,28 @@ rust_library(
     name = "buck2_eden",
     srcs = glob(["src/**/*.rs"]),
     named_deps = {
-        # @oss-disable: "edenfs": "//eden/fs/service:thrift-rust", 
-        # @oss-disable: "edenfs_clients": "//eden/fs/service:thrift-rust-clients", 
+        # @oss-disable[end= ]: "edenfs": "//eden/fs/service:thrift-rust",
+        # @oss-disable[end= ]: "edenfs_clients": "//eden/fs/service:thrift-rust-clients",
     },
     deps = [
-        # @oss-disable: "fbsource//third-party/rust:async-trait", 
-        # @oss-disable: "fbsource//third-party/rust:compact_str", 
-        # @oss-disable: "fbsource//third-party/rust:futures", 
-        # @oss-disable: "fbsource//third-party/rust:libc", 
-        # @oss-disable: "fbsource//third-party/rust:parking_lot", 
-        # @oss-disable: "fbsource//third-party/rust:serde", 
-        # @oss-disable: "fbsource//third-party/rust:tokio", 
-        # @oss-disable: "fbsource//third-party/rust:toml", 
-        # @oss-disable: "fbsource//third-party/rust:tracing", 
-        # @oss-disable: "//buck2/allocative/allocative:allocative", 
-        # @oss-disable: "//buck2/app/buck2_certs:buck2_certs", 
-        # @oss-disable: "//buck2/app/buck2_common:buck2_common", 
-        # @oss-disable: "//buck2/app/buck2_core:buck2_core", 
-        # @oss-disable: "//buck2/app/buck2_error:buck2_error", 
-        # @oss-disable: "//buck2/gazebo/dupe:dupe", 
-        # @oss-disable: "//common/rust/shed/fbinit:fbinit", 
-        # @oss-disable: "//common/rust/shed/sorted_vector_map:sorted_vector_map", 
-        # @oss-disable: "//common/rust/thrift/bareclient:thriftclient", 
-        # @oss-disable: "//fb303/thrift:fb303_core-rust-clients", 
+        # @oss-disable[end= ]: "fbsource//third-party/rust:async-trait",
+        # @oss-disable[end= ]: "fbsource//third-party/rust:compact_str",
+        # @oss-disable[end= ]: "fbsource//third-party/rust:futures",
+        # @oss-disable[end= ]: "fbsource//third-party/rust:libc",
+        # @oss-disable[end= ]: "fbsource//third-party/rust:parking_lot",
+        # @oss-disable[end= ]: "fbsource//third-party/rust:serde",
+        # @oss-disable[end= ]: "fbsource//third-party/rust:tokio",
+        # @oss-disable[end= ]: "fbsource//third-party/rust:toml",
+        # @oss-disable[end= ]: "fbsource//third-party/rust:tracing",
+        # @oss-disable[end= ]: "//buck2/allocative/allocative:allocative",
+        # @oss-disable[end= ]: "//buck2/app/buck2_certs:buck2_certs",
+        # @oss-disable[end= ]: "//buck2/app/buck2_common:buck2_common",
+        # @oss-disable[end= ]: "//buck2/app/buck2_core:buck2_core",
+        # @oss-disable[end= ]: "//buck2/app/buck2_error:buck2_error",
+        # @oss-disable[end= ]: "//buck2/gazebo/dupe:dupe",
+        # @oss-disable[end= ]: "//common/rust/shed/fbinit:fbinit",
+        # @oss-disable[end= ]: "//common/rust/shed/sorted_vector_map:sorted_vector_map",
+        # @oss-disable[end= ]: "//common/rust/thrift/bareclient:thriftclient",
+        # @oss-disable[end= ]: "//fb303/thrift:fb303_core-rust-clients",
     ],
 )

app/buck2_error/BUCK

@@ -8,7 +8,7 @@ rust_library(
         ["src/**/*.rs"],
     ),
     named_deps = {
-        # @oss-disable: "edenfs_clients": "//eden/fs/service:thrift-rust-clients", 
+        # @oss-disable[end= ]: "edenfs_clients": "//eden/fs/service:thrift-rust-clients",
     },
     os_deps = [
         (

app/buck2_events/BUCK

@@ -30,9 +30,9 @@ rust_library(
         "fbsource//third-party/rust:is_proc_translated",
         "fbsource//third-party/rust:once_cell",
         "fbsource//third-party/rust:pin-project",
-        # @oss-disable: "fbsource//third-party/rust:prost", 
+        # @oss-disable[end= ]: "fbsource//third-party/rust:prost",
         "fbsource//third-party/rust:serde",
-        # @oss-disable: "fbsource//third-party/rust:serde_json", 
+        # @oss-disable[end= ]: "fbsource//third-party/rust:serde_json",
         "fbsource//third-party/rust:smallvec",
         "fbsource//third-party/rust:tokio",
         "fbsource//third-party/rust:uuid",
@@ -46,9 +46,9 @@ rust_library(
         "//buck2/app/buck2_wrapper_common:buck2_wrapper_common",
         "//buck2/gazebo/dupe:dupe",
         "//buck2/gazebo/gazebo:gazebo",
-        # @oss-disable: "//buck2/shed/scribe_client:scribe_client", 
+        # @oss-disable[end= ]: "//buck2/shed/scribe_client:scribe_client",
         "//common/rust/shed/fbinit:fbinit",
-        # @oss-disable: "//common/rust/user:user", 
-        # @oss-disable: "//devx_www/cross_env_session_id:cross_env_session_id", 
+        # @oss-disable[end= ]: "//common/rust/user:user",
+        # @oss-disable[end= ]: "//devx_www/cross_env_session_id:cross_env_session_id",
     ],
 )

app/buck2_execute/BUCK

@@ -58,7 +58,7 @@ rust_library(
         "//buck2/app/buck2_util:buck2_util",
         "//buck2/app/buck2_wrapper_common:buck2_wrapper_common",
         "//buck2/dice/dice:dice",
-        # @oss-disable: "//buck2/facebook/test_env_allowlist:test_env_allowlist", 
+        # @oss-disable[end= ]: "//buck2/facebook/test_env_allowlist:test_env_allowlist",
         "//buck2/gazebo/dupe:dupe",
         "//buck2/gazebo/gazebo:gazebo",
         "//buck2/host_sharing:host_sharing",

app/buck2_execute_impl/BUCK

@@ -12,8 +12,8 @@ rust_library(
             "linux",
             [
                 "//buck2/app/buck2_forkserver_proto:buck2_forkserver_proto",
-                # @oss-disable: "//common/rust/shed/hostcaps:hostcaps", 
-                # @oss-disable: "//justknobs/rust:justknobs", 
+                # @oss-disable[end= ]: "//common/rust/shed/hostcaps:hostcaps",
+                # @oss-disable[end= ]: "//justknobs/rust:justknobs",
             ],
         ),
         (

app/buck2_file_watcher/BUCK

@@ -6,7 +6,7 @@ rust_library(
     name = "buck2_file_watcher",
     srcs = glob(["src/**/*.rs"]),
     named_deps = {
-        # @oss-disable: "edenfs": "//eden/fs/service:thrift-rust", 
+        # @oss-disable[end= ]: "edenfs": "//eden/fs/service:thrift-rust",
     },
     test_deps = [
         "fbsource//third-party/rust:tempfile",

app/buck2_http/BUCK

@@ -56,6 +56,6 @@ rust_library(
         "//buck2/app/buck2_certs:buck2_certs",
         "//buck2/app/buck2_error:buck2_error",
         "//buck2/gazebo/dupe:dupe",
-        # @oss-disable: "//common/rust/cpe:cpe", 
+        # @oss-disable[end= ]: "//common/rust/cpe:cpe",
     ],
 )

app/buck2_server/BUCK

@@ -58,7 +58,7 @@ rust_library(
         "fbsource//third-party/rust:tokio-stream",
         "fbsource//third-party/rust:tonic",
         "fbsource//third-party/rust:tracing",
-        # @oss-disable: "//blake3:blake3-constants-rust-nothrift", 
+        # @oss-disable[end= ]: "//blake3:blake3-constants-rust-nothrift",
         "//buck2/allocative/allocative:allocative",
         "//buck2/app/buck2_analysis:buck2_analysis",
         "//buck2/app/buck2_build_api:buck2_build_api",
@@ -97,7 +97,7 @@ rust_library(
         "//buck2/host_sharing:host_sharing",
         "//buck2/starlark-rust/starlark:starlark",
         "//buck2/starlark-rust/starlark_lsp:starlark_lsp",
-        # @oss-disable: "//common/rust/shed/detect_eden:detect_eden", 
+        # @oss-disable[end= ]: "//common/rust/shed/detect_eden:detect_eden",
         "//common/rust/shed/fbinit:fbinit",
     ],
 )

app/buck2_server_commands/BUCK

@@ -42,7 +42,7 @@ rust_library(
         "//buck2/app/buck2_event_observer:buck2_event_observer",
         "//buck2/app/buck2_events:buck2_events",
         "//buck2/app/buck2_execute:buck2_execute",
-        # @oss-disable: "//buck2/app/buck2_explain:buck2_explain", 
+        # @oss-disable[end= ]: "//buck2/app/buck2_explain:buck2_explain",
         "//buck2/app/buck2_futures:buck2_futures",
         "//buck2/app/buck2_install_proto:buck2_install_proto",
         "//buck2/app/buck2_interpreter:buck2_interpreter",

app/buck2_util/BUCK

@@ -2,7 +2,7 @@ load("@fbcode_macros//build_defs:rust_library.bzl", "rust_library")
 
 oncall("build_infra")
 
-# @oss-disable: _is_oss = False 
+# @oss-disable[end= ]: _is_oss = False
 _is_oss = True # @oss-enable
 
 rust_library(

app_dep_graph_rules/test_impl.bzl

@@ -5,7 +5,7 @@
 # License, Version 2.0 found in the LICENSE-APACHE file in the root directory
 # of this source tree.
 
-# @oss-disable: load("@fbcode_macros//build_defs:platform_utils.bzl", "platform_utils") 
+# @oss-disable[end= ]: load("@fbcode_macros//build_defs:platform_utils.bzl", "platform_utils")
 load(":rules.bzl", "BANNED_DEP_PATHS", "LATE_BINDING_ONLY_CRATES")
 
 platform_utils = None # @oss-enable

integrations/rust-project/BUCK

@@ -22,7 +22,7 @@ rust_binary(
         "fbsource//third-party/rust:tracing",
         "fbsource//third-party/rust:tracing-subscriber",
         "fbsource//third-party/rust:whoami",
-        # @oss-disable: "//common/rust/scuba:scuba", 
-        # @oss-disable: "//common/rust/shed/fbinit:fbinit", 
+        # @oss-disable[end= ]: "//common/rust/scuba:scuba",
+        # @oss-disable[end= ]: "//common/rust/shed/fbinit:fbinit",
     ],
 )

prelude/apple/apple_binary.bzl

@@ -10,7 +10,7 @@ load("@prelude//:paths.bzl", "paths")
 load("@prelude//:validation_deps.bzl", "get_validation_deps_outputs")
 load("@prelude//apple:apple_stripping.bzl", "apple_strip_args")
 load("@prelude//apple:apple_utility.bzl", "get_module_name")
-# @oss-disable: load("@prelude//apple/meta_only:linker_outputs.bzl", "get_extra_linker_output_flags", "get_extra_linker_outputs") 
+# @oss-disable[end= ]: load("@prelude//apple/meta_only:linker_outputs.bzl", "get_extra_linker_output_flags", "get_extra_linker_outputs")
 load(
     "@prelude//apple/swift:swift_compilation.bzl",
     "compile_swift",
@@ -252,12 +252,12 @@ def apple_binary_impl(ctx: AnalysisContext) -> [list[Provider], Promise]:
 
 def _get_extra_linker_outputs(ctx: AnalysisContext) -> ExtraLinkerOutputs:
     _ = ctx  # buildifier: disable=unused-variable
-    # @oss-disable: return get_extra_linker_outputs(ctx) 
+    # @oss-disable[end= ]: return get_extra_linker_outputs(ctx)
     return ExtraLinkerOutputs() # @oss-enable
 
 def _get_extra_linker_outputs_flags(ctx: AnalysisContext, outputs: dict[str, Artifact]) -> list[ArgLike]:
     _ = ctx  # buildifier: disable=unused-variable
-    # @oss-disable: return get_extra_linker_output_flags(ctx, outputs) 
+    # @oss-disable[end= ]: return get_extra_linker_output_flags(ctx, outputs)
     return [] # @oss-enable
 
 def _filter_swift_srcs(ctx: AnalysisContext) -> (list[CxxSrcWithFlags], list[CxxSrcWithFlags]):

prelude/apple/apple_bundle.bzl

@@ -16,7 +16,7 @@ load("@prelude//:validation_deps.bzl", "get_validation_deps_outputs")
 load("@prelude//apple:apple_toolchain_types.bzl", "AppleToolchainInfo", "AppleToolsInfo")
 load("@prelude//apple:apple_xctest_frameworks_utility.bzl", "get_xctest_frameworks_bundle_parts")
 load("@prelude//apple:debug.bzl", "AppleSelectiveDebuggableMetadata")
-# @oss-disable: load("@prelude//apple/meta_only:linker_outputs.bzl", "subtargets_for_apple_bundle_extra_outputs") 
+# @oss-disable[end= ]: load("@prelude//apple/meta_only:linker_outputs.bzl", "subtargets_for_apple_bundle_extra_outputs")
 load("@prelude//apple/user:apple_selected_debug_path_file.bzl", "SELECTED_DEBUG_PATH_FILE_NAME")
 load("@prelude//apple/user:apple_selective_debugging.bzl", "AppleSelectiveDebuggingInfo")
 load("@prelude//apple/validation:debug_artifacts.bzl", "get_debug_artifacts_validators")
@@ -426,8 +426,8 @@ def apple_bundle_impl(ctx: AnalysisContext) -> list[Provider]:
 
     # Collect extra bundle outputs
     extra_output_provider = _extra_output_provider(ctx)
-    # @oss-disable: extra_output_subtargets = subtargets_for_apple_bundle_extra_outputs(ctx, extra_output_provider) 
-    # @oss-disable: sub_targets.update(extra_output_subtargets) 
+    # @oss-disable[end= ]: extra_output_subtargets = subtargets_for_apple_bundle_extra_outputs(ctx, extra_output_provider)
+    # @oss-disable[end= ]: sub_targets.update(extra_output_subtargets)
 
     # index store
     index_store_subtargets, index_store_info = _index_store_data(ctx)

prelude/apple/apple_error_handler.bzl

@@ -6,7 +6,7 @@
 # of this source tree.
 
 load("@prelude//apple:apple_error_handler_types.bzl", "AppleErrorCategories")
-# @oss-disable: load("@prelude//apple/meta_only:apple_extra_error_categories.bzl", "APPLE_META_STDERR_ERROR_CATEGORIES") 
+# @oss-disable[end= ]: load("@prelude//apple/meta_only:apple_extra_error_categories.bzl", "APPLE_META_STDERR_ERROR_CATEGORIES")
 
 _APPLE_STDERR_ERROR_CATEGORIES = [
     #codesigning issues
@@ -58,6 +58,6 @@ def apple_build_error_handler(ctx: ActionErrorCtx) -> list[ActionSubError]:
     lowercase_stderr = ctx.stderr.lower()
     categories = set()
     _add_category_strings(lowercase_stderr, categories, _APPLE_STDERR_ERROR_CATEGORIES)
-    # @oss-disable: _add_category_strings(lowercase_stderr, categories, APPLE_META_STDERR_ERROR_CATEGORIES) 
+    # @oss-disable[end= ]: _add_category_strings(lowercase_stderr, categories, APPLE_META_STDERR_ERROR_CATEGORIES)
 
     return [ctx.new_sub_error(category = category_string) for category_string in sorted(categories)]

prelude/apple/apple_library.bzl

@@ -17,8 +17,8 @@ load("@prelude//apple:apple_dsym.bzl", "DSYM_SUBTARGET", "get_apple_dsym")
 load("@prelude//apple:apple_error_handler.bzl", "apple_build_error_handler")
 load("@prelude//apple:apple_stripping.bzl", "apple_strip_args")
 load("@prelude//apple:apple_toolchain_types.bzl", "AppleToolchainInfo")
-# @oss-disable: load("@prelude//apple/meta_only:apple_library_meta_validation.bzl", "apple_library_validate_for_meta_restrictions") 
-# @oss-disable: load("@prelude//apple/meta_only:linker_outputs.bzl", "get_extra_linker_output_flags", "get_extra_linker_outputs") 
+# @oss-disable[end= ]: load("@prelude//apple/meta_only:apple_library_meta_validation.bzl", "apple_library_validate_for_meta_restrictions")
+# @oss-disable[end= ]: load("@prelude//apple/meta_only:linker_outputs.bzl", "get_extra_linker_output_flags", "get_extra_linker_outputs")
 load("@prelude//apple/mockingbird:mockingbird_types.bzl", "MockingbirdLibraryInfo", "MockingbirdLibraryInfoTSet", "MockingbirdLibraryRecord", "MockingbirdSourcesInfo", "MockingbirdTargetType")
 load(
     "@prelude//apple/swift:swift_compilation.bzl",
@@ -146,7 +146,7 @@ AppleLibraryForDistributionInfo = provider(
 )
 
 def apple_library_impl(ctx: AnalysisContext) -> [Promise, list[Provider]]:
-    # @oss-disable: apple_library_validate_for_meta_restrictions(ctx) 
+    # @oss-disable[end= ]: apple_library_validate_for_meta_restrictions(ctx)
 
     def get_apple_library_providers(deps_providers) -> list[Provider]:
         shared_type = AppleSharedLibraryMachOFileType(ctx.attrs.shared_library_macho_file_type)
@@ -549,12 +549,12 @@ def apple_library_rule_constructor_params_and_swift_providers(ctx: AnalysisConte
 
 def _get_extra_linker_outputs(ctx: AnalysisContext) -> ExtraLinkerOutputs:
     _ = ctx  # buildifier: disable=unused-variable
-    # @oss-disable: return get_extra_linker_outputs(ctx) 
+    # @oss-disable[end= ]: return get_extra_linker_outputs(ctx)
     return ExtraLinkerOutputs() # @oss-enable
 
 def _get_extra_linker_outputs_flags(ctx: AnalysisContext, outputs: dict[str, Artifact]) -> list[ArgLike]:
     _ = ctx  # buildifier: disable=unused-variable
-    # @oss-disable: return get_extra_linker_output_flags(ctx, outputs) 
+    # @oss-disable[end= ]: return get_extra_linker_output_flags(ctx, outputs)
     return [] # @oss-enable
 
 def _filter_swift_srcs(ctx: AnalysisContext, additional_srcs: list = []) -> (list[CxxSrcWithFlags], list[CxxSrcWithFlags]):