cargo: Autocargo for app and friends (#1343)

allocative/allocative/BUCK

@@ -17,6 +17,30 @@ rust_library(
     srcs = glob(
         ["src/**/*.rs"],
     ),
+    # FIXME(JakobDegen): Needed because autocargo doesn't handle the select below
+    autocargo = {
+        "edge_features": [
+            "anyhow",
+            "bumpalo",
+            "chrono",
+            "dashmap",
+            "either",
+            "futures",
+            "hashbrown",
+            "indexmap",
+            "num-bigint",
+            "once_cell",
+            "parking_lot",
+            "prost-types",
+            "slab",
+            "smallvec",
+            "compact_str",
+            "serde_json",
+            "sorted_vector_map",
+            "tokio",
+            "triomphe",
+        ],
+    },
     features = [
         "anyhow",
         "bumpalo",

app/buck2/BUCK

@@ -10,6 +10,30 @@ prelude = native
 rust_library(
     name = "buck2",
     srcs = glob(["src/**/*.rs"]),
+    # Cargo-only deps used in `bin/buck2.rs` under `#[cfg(not(buck_build))]`.
+    # On linux/macos cargo uses jemalloc as the global allocator; buck builds
+    # rely on fbcode.default_allocator instead.
+    autocargo = {
+        "cargo_toml_config": {
+            "dependencies_override": {
+                "dependencies": {
+                    "fbinit": {
+                        "path": None,
+                        "version": "0.2",
+                    },
+                },
+            },
+            "extra_buck_dependencies": {
+                "target": {
+                    '\'cfg(any(target_os = "linux", target_os = "macos"))\'': {
+                        "dependencies": [
+                            "fbsource//third-party/rust:jemallocator",
+                        ],
+                    },
+                },
+            },
+        },
+    },
     rustc_flags = select({
         ":buck2_client_only_build": ["--cfg=client_only"],
         "DEFAULT": [],

app/buck2/Cargo.toml

@@ -1,91 +1,89 @@
+# @generated by autocargo from //buck2/app/buck2:[buck2,buck2-bin]
+
 [package]
-description = ""
-edition = "2024"
-license = { workspace = true }
 name = "buck2"
-repository = { workspace = true }
-version = "0.1.0"
-
-[dependencies]
-backtrace = { workspace = true }
-blake3 = { workspace = true }
-clap = { workspace = true }
-fbinit = { workspace = true }
-hex = { workspace = true }
-rustls = { workspace = true }
-tokio = { workspace = true }
-tracing = { workspace = true }
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
-dupe = { workspace = true }
-gazebo = { workspace = true }
-host_sharing = { workspace = true }
-superconsole = { version = "0.2.0", path = "../../superconsole" }
+[[bin]]
+name = "buck2"
+path = "bin/buck2.rs"
+test = false
 
-buck2_action_impl = { workspace = true }
-buck2_analysis = { workspace = true }
-buck2_anon_target = { workspace = true }
-buck2_build_api = { workspace = true }
-buck2_build_info = { workspace = true }
-buck2_build_signals = { workspace = true }
-buck2_build_signals_impl = { workspace = true }
-buck2_bxl = { workspace = true }
-buck2_certs = { workspace = true }
-buck2_cfg_constructor = { workspace = true }
-buck2_client = { workspace = true }
-buck2_client_ctx = { workspace = true }
-buck2_cmd_audit_client = { workspace = true }
-buck2_cmd_audit_server = { workspace = true }
-buck2_cmd_completion_client = { workspace = true }
-buck2_cmd_debug_client = { workspace = true }
-buck2_cmd_docs_client = { workspace = true }
-buck2_cmd_docs_server = { workspace = true }
-buck2_cmd_log_client = { workspace = true }
-buck2_cmd_query_server = { workspace = true }
-buck2_cmd_rage_client = { workspace = true }
-buck2_cmd_starlark_client = { workspace = true }
-buck2_cmd_starlark_server = { workspace = true }
-buck2_cmd_targets_server = { workspace = true }
-buck2_common = { workspace = true }
-buck2_configured = { workspace = true }
-buck2_core = { workspace = true }
-buck2_daemon = { workspace = true }
-buck2_data = { workspace = true }
-buck2_error = { workspace = true }
-buck2_event_log = { workspace = true }
-buck2_event_observer = { workspace = true }
-buck2_events = { workspace = true }
-buck2_external_cells = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_interpreter_for_build = { workspace = true }
-buck2_query_impls = { workspace = true }
-buck2_server = { workspace = true }
-buck2_server_commands = { workspace = true }
-buck2_test = { workspace = true }
-buck2_test_runner = { workspace = true }
-buck2_transition = { workspace = true }
-buck2_util = { workspace = true }
-buck2_validation = { workspace = true }
-buck2_wrapper_common = { workspace = true }
+[dependencies]
+backtrace.workspace = true
+buck2_action_impl.workspace = true
+buck2_analysis.workspace = true
+buck2_anon_target.workspace = true
+buck2_build_api.workspace = true
+buck2_build_info.workspace = true
+buck2_build_signals_impl.workspace = true
+buck2_bxl.workspace = true
+buck2_certs.workspace = true
+buck2_cfg_constructor.workspace = true
+buck2_client.workspace = true
+buck2_client_ctx.workspace = true
+buck2_cmd_audit_client.workspace = true
+buck2_cmd_audit_server.workspace = true
+buck2_cmd_completion_client.workspace = true
+buck2_cmd_debug_client.workspace = true
+buck2_cmd_docs_client.workspace = true
+buck2_cmd_docs_server.workspace = true
+buck2_cmd_log_client.workspace = true
+buck2_cmd_query_server.workspace = true
+buck2_cmd_rage_client.workspace = true
+buck2_cmd_starlark_client.workspace = true
+buck2_cmd_starlark_server.workspace = true
+buck2_cmd_targets_server.workspace = true
+buck2_common.workspace = true
+buck2_configured.workspace = true
+buck2_core.workspace = true
+buck2_daemon.workspace = true
+buck2_data.workspace = true
+buck2_error.workspace = true
+buck2_event_log.workspace = true
+buck2_event_observer.workspace = true
+buck2_events.workspace = true
+buck2_external_cells.workspace = true
+buck2_fs.workspace = true
+buck2_hash.workspace = true
+buck2_interpreter_for_build.workspace = true
+buck2_query_impls.workspace = true
+buck2_server.workspace = true
+buck2_server_commands.workspace = true
+buck2_test.workspace = true
+buck2_test_runner.workspace = true
+buck2_transition.workspace = true
+buck2_util.workspace = true
+buck2_validation.workspace = true
+buck2_wrapper_common.workspace = true
+clap.workspace = true
+dupe.workspace = true
+fbinit.workspace = true
+superconsole.workspace = true
+tokio.workspace = true
+tracing.workspace = true
 
 [target.'cfg(any(target_os = "linux", target_os = "macos"))'.dependencies]
-tikv-jemallocator = { workspace = true }
-
-[target.'cfg(unix)'.dependencies]
-dirs = { workspace = true }
-libc = { workspace = true }
-nix = { workspace = true }
+tikv-jemallocator.workspace = true
 
-buck2_forkserver = { workspace = true }
+[target.'cfg(target_os = "linux")'.dependencies]
+buck2_forkserver.workspace = true
+dirs.workspace = true
+libc.workspace = true
+nix.workspace = true
 
-[target.'cfg(windows)'.dependencies]
-libc = { workspace = true }
-mimalloc = { workspace = true }
-windows-sys = { workspace = true }
+[target.'cfg(target_os = "macos")'.dependencies]
+buck2_forkserver.workspace = true
+dirs.workspace = true
+libc.workspace = true
+nix.workspace = true
 
-[[bin]]
-name = "buck2"
-path = "bin/buck2.rs"
+[target.'cfg(target_os = "windows")'.dependencies]
+mimalloc.workspace = true
+windows-sys.workspace = true
 
-[lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ["cfg(buck_build)", "cfg(client_only)", "cfg(fbcode_build)"] }
+[lints]
+workspace = true

app/buck2_action_impl/BUCK

@@ -5,6 +5,18 @@ oncall("build_infra")
 rust_library(
     name = "buck2_action_impl",
     srcs = glob(["src/**/*.rs"]),
+    # `//buck2/remote_execution:remote_execution` is an alias selecting between
+    # the internal and OSS impls; autocargo doesn't follow aliases, so point at
+    # the OSS rust_library directly for cargo's sake.
+    autocargo = {
+        "cargo_toml_config": {
+            "extra_buck_dependencies": {
+                "dependencies": [
+                    "fbcode//buck2/remote_execution/oss/re_grpc:remote_execution",
+                ],
+            },
+        },
+    },
     deps = [
         "fbsource//third-party/rust:async-trait",
         "fbsource//third-party/rust:chrono",

app/buck2_action_impl/Cargo.toml

@@ -1,59 +1,58 @@
+# @generated by autocargo from //buck2/app/buck2_action_impl:buck2_action_impl
+
 [package]
-description = "Action implementations and context functions"
-edition = "2024"
-license = { workspace = true }
 name = "buck2_action_impl"
-repository = { workspace = true }
-version = "0.1.0"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [dependencies]
-async-trait = { workspace = true }
-chrono = { workspace = true }
-ctor = { workspace = true }
-dashmap = { workspace = true }
-derive_more = { workspace = true }
-dupe = { workspace = true }
-either = { workspace = true }
-futures = { workspace = true }
-hex = { workspace = true }
-http = { workspace = true }
-itertools = { workspace = true }
-once_cell = { workspace = true }
-parking_lot = { workspace = true }
-rustc-hash = { workspace = true }
-serde_json = { workspace = true }
-sha1 = { workspace = true }
-smallvec = { workspace = true }
-static_assertions = { workspace = true }
-tracing = { workspace = true }
-
-allocative = { workspace = true }
-dice = { workspace = true }
-gazebo = { workspace = true }
-pagable = { workspace = true }
-sorted_vector_map = { workspace = true }
-starlark = { workspace = true }
-starlark_map = { workspace = true }
+allocative.workspace = true
+async-trait.workspace = true
+buck2_action_metadata_proto.workspace = true
+buck2_analysis.workspace = true
+buck2_artifact.workspace = true
+buck2_build_api.workspace = true
+buck2_build_signals.workspace = true
+buck2_common.workspace = true
+buck2_core.workspace = true
+buck2_data.workspace = true
+buck2_directory.workspace = true
+buck2_error.workspace = true
+buck2_events.workspace = true
+buck2_execute.workspace = true
+buck2_file_watcher.workspace = true
+buck2_fs.workspace = true
+buck2_hash.workspace = true
+buck2_http.workspace = true
+buck2_interpreter.workspace = true
+buck2_util.workspace = true
+chrono.workspace = true
+ctor.workspace = true
+derive_more.workspace = true
+dice.workspace = true
+dice_futures.workspace = true
+dupe.workspace = true
+either.workspace = true
+futures.workspace = true
+gazebo.workspace = true
+hex.workspace = true
+host_sharing.workspace = true
+http.workspace = true
+itertools.workspace = true
+once_cell.workspace = true
+pagable.workspace = true
+parking_lot.workspace = true
+remote_execution.workspace = true
+serde_json.workspace = true
+sha1.workspace = true
+smallvec.workspace = true
+sorted_vector_map.workspace = true
+starlark.workspace = true
+starlark_map.workspace = true
+static_assertions.workspace = true
+tracing.workspace = true
 
-buck2_action_metadata_proto = { workspace = true }
-buck2_analysis = { workspace = true }
-buck2_artifact = { workspace = true }
-buck2_build_api = { workspace = true }
-buck2_build_signals = { workspace = true }
-buck2_common = { workspace = true }
-buck2_core = { workspace = true }
-buck2_data = { workspace = true }
-buck2_directory = { workspace = true }
-buck2_error = { workspace = true }
-buck2_events = { workspace = true }
-buck2_execute = { workspace = true }
-buck2_file_watcher = { workspace = true }
-buck2_fs = { workspace = true }
-buck2_hash = { workspace = true }
-buck2_http = { workspace = true }
-buck2_interpreter = { workspace = true }
-buck2_node = { workspace = true }
-buck2_util = { workspace = true }
-dice_futures = { workspace = true }
-host_sharing = { workspace = true }
-remote_execution = { workspace = true }
+[lints]
+workspace = true