Update tonic 0.10 usages to 0.12

David Tolnay · meta-codesync[bot] · commit 67217c4c8f63 · 2026-03-04T08:27:35.000-08:00
Reviewed By: diliop

Differential Revision: D95149187

fbshipit-source-id: e0a3d03ebed7e9b0255e12a5ad25f7b4c9ad10fd
diff --git a/app/buck2_action_metadata_proto/BUCK b/app/buck2_action_metadata_proto/BUCK
@@ -1,8 +1,8 @@
-load("@fbcode//buck2:proto_defs.bzl", "proto_srcs", "rust_protobuf_library_prost_0134")
+load("@fbcode//buck2:proto_defs.bzl", "proto_srcs", "rust_protobuf_library")
 
 oncall("build_infra")
 
-rust_protobuf_library_prost_0134(
+rust_protobuf_library(
     name = "buck2_action_metadata_proto",
     srcs = glob(["src/**/*.rs"]),
     build_script = "build.rs",
diff --git a/app/buck2_cli_proto/BUCK b/app/buck2_cli_proto/BUCK
@@ -1,10 +1,10 @@
-load("@fbcode//buck2:proto_defs.bzl", "proto_srcs", "rust_protobuf_library_prost_0134")
+load("@fbcode//buck2:proto_defs.bzl", "proto_srcs", "rust_protobuf_library")
 load("@fbcode_macros//build_defs:export_files.bzl", "export_file")
 load("@fbcode_macros//build_defs/lib:oss.bzl", "translate_target")
 
 oncall("build_infra")
 
-rust_protobuf_library_prost_0134(
+rust_protobuf_library(
     name = "buck2_cli_proto",
     srcs = glob(["src/**/*.rs"]),
     build_script = "build.rs",
diff --git a/app/buck2_data/BUCK b/app/buck2_data/BUCK
@@ -1,10 +1,10 @@
-load("@fbcode//buck2:proto_defs.bzl", "proto_srcs", "rust_protobuf_library_prost_0134")
+load("@fbcode//buck2:proto_defs.bzl", "proto_srcs", "rust_protobuf_library")
 load("@fbcode_macros//build_defs:export_files.bzl", "export_file")
 load("@fbcode_macros//build_defs/lib:oss.bzl", "translate_target")
 
 oncall("build_infra")
 
-rust_protobuf_library_prost_0134(
+rust_protobuf_library(
     name = "buck2_data",
     srcs = glob(["src/**/*.rs"]),
     build_script = "build.rs",
diff --git a/app/buck2_downward_api_proto/BUCK b/app/buck2_downward_api_proto/BUCK
@@ -1,8 +1,8 @@
-load("@fbcode//buck2:proto_defs.bzl", "proto_srcs", "rust_protobuf_library_prost_0134")
+load("@fbcode//buck2:proto_defs.bzl", "proto_srcs", "rust_protobuf_library")
 
 oncall("build_infra")
 
-rust_protobuf_library_prost_0134(
+rust_protobuf_library(
     name = "buck2_downward_api_proto",
     srcs = glob(["src/**/*.rs"]),
     build_script = "build.rs",
diff --git a/app/buck2_execute_impl/BUCK b/app/buck2_execute_impl/BUCK
@@ -48,7 +48,7 @@ rust_library(
         "//buck2/app/buck2_http:buck2_http",
         "//buck2/app/buck2_resource_control:buck2_resource_control",
         "//buck2/app/buck2_util:buck2_util",
-        "//buck2/app/buck2_worker_proto:buck2_worker_proto_modern_prost",
+        "//buck2/app/buck2_worker_proto:buck2_worker_proto",
         "//buck2/app/buck2_wrapper_common:buck2_wrapper_common",
         "//buck2/dice/dice_futures:dice_futures",
         "//buck2/gazebo/dupe:dupe",
diff --git a/app/buck2_forkserver_proto/BUCK b/app/buck2_forkserver_proto/BUCK
@@ -1,10 +1,10 @@
-load("@fbcode//buck2:proto_defs.bzl", "proto_srcs", "rust_protobuf_library_prost_0134")
+load("@fbcode//buck2:proto_defs.bzl", "proto_srcs", "rust_protobuf_library")
 load("@fbcode//grpc_fb/codegen:buck_macros.bzl", "grpc_library")
 load("@fbcode_macros//build_defs/lib:oss.bzl", "translate_target")
 
 oncall("build_infra")
 
-rust_protobuf_library_prost_0134(
+rust_protobuf_library(
     name = "buck2_forkserver_proto",
     srcs = glob(["src/**/*.rs"]),
     build_script = "build.rs",
diff --git a/app/buck2_health_check_proto/BUCK b/app/buck2_health_check_proto/BUCK
@@ -1,10 +1,10 @@
-load("@fbcode//buck2:proto_defs.bzl", "proto_srcs", "rust_protobuf_library_prost_0134")
+load("@fbcode//buck2:proto_defs.bzl", "proto_srcs", "rust_protobuf_library")
 load("@fbcode//grpc_fb/codegen:buck_macros.bzl", "grpc_library")
 load("@fbcode_macros//build_defs/lib:oss.bzl", "translate_target")
 
 oncall("build_infra")
 
-rust_protobuf_library_prost_0134(
+rust_protobuf_library(
     name = "buck2_health_check_proto",
     srcs = glob(["src/**/*.rs"]),
     build_script = "build.rs",
diff --git a/app/buck2_host_sharing_proto/BUCK b/app/buck2_host_sharing_proto/BUCK
@@ -1,9 +1,9 @@
-load("@fbcode//buck2:proto_defs.bzl", "proto_srcs", "rust_protobuf_library_prost_0134")
+load("@fbcode//buck2:proto_defs.bzl", "proto_srcs", "rust_protobuf_library")
 load("@fbcode_macros//build_defs:export_files.bzl", "export_file")
 
 oncall("build_infra")
 
-rust_protobuf_library_prost_0134(
+rust_protobuf_library(
     name = "buck2_host_sharing_proto",
     srcs = glob(["src/**/*.rs"]),
     build_script = "build.rs",
diff --git a/app/buck2_install_proto/BUCK b/app/buck2_install_proto/BUCK
@@ -1,9 +1,9 @@
-load("@fbcode//buck2:proto_defs.bzl", "proto_srcs", "rust_protobuf_library_prost_0134")
+load("@fbcode//buck2:proto_defs.bzl", "proto_srcs", "rust_protobuf_library")
 load("@fbcode//grpc_fb/codegen:buck_macros.bzl", "grpc_library")
 
 oncall("build_infra")
 
-rust_protobuf_library_prost_0134(
+rust_protobuf_library(
     name = "buck2_install_proto",
     srcs = glob(["src/**/*.rs"]),
     build_script = "build.rs",
diff --git a/app/buck2_protoc_dev/BUCK b/app/buck2_protoc_dev/BUCK
@@ -8,18 +8,6 @@ rust_library(
     rustc_flags = [
         "--cfg=buck2_build",
     ],
-    deps = [
-        "fbsource//third-party/rust:tonic-build-0-10",
-    ],
-)
-
-rust_library(
-    name = "buck2_protoc_dev-tonic-0-12-3",
-    srcs = glob(["src/**/*.rs"]),
-    crate = "buck2_protoc_dev",
-    rustc_flags = [
-        "--cfg=buck2_build",
-    ],
     deps = [
         "fbsource//third-party/rust:tonic-build-0-12",
     ],
diff --git a/app/buck2_subscription_proto/BUCK b/app/buck2_subscription_proto/BUCK
@@ -1,10 +1,10 @@
-load("@fbcode//buck2:proto_defs.bzl", "proto_srcs", "rust_protobuf_library_prost_0134")
+load("@fbcode//buck2:proto_defs.bzl", "proto_srcs", "rust_protobuf_library")
 load("@fbcode//grpc_fb/codegen:buck_macros.bzl", "grpc_library")
 load("@fbcode_macros//build_defs:export_files.bzl", "export_file")
 
 oncall("build_infra")
 
-rust_protobuf_library_prost_0134(
+rust_protobuf_library(
     name = "buck2_subscription_proto",
     srcs = glob(["src/**/*.rs"]),
     build_script = "build.rs",
diff --git a/app/buck2_test_proto/BUCK b/app/buck2_test_proto/BUCK
@@ -1,9 +1,9 @@
-load("@fbcode//buck2:proto_defs.bzl", "proto_srcs", "rust_protobuf_library_prost_0134")
+load("@fbcode//buck2:proto_defs.bzl", "proto_srcs", "rust_protobuf_library")
 load("@fbcode_macros//build_defs/lib:oss.bzl", "translate_target")
 
 oncall("build_infra")
 
-rust_protobuf_library_prost_0134(
+rust_protobuf_library(
     name = "buck2_test_proto",
     srcs = glob(["src/**/*.rs"]),
     build_script = "build.rs",
diff --git a/app/buck2_worker_proto/BUCK b/app/buck2_worker_proto/BUCK
@@ -1,4 +1,4 @@
-load("@fbcode//buck2:proto_defs.bzl", "proto_srcs", "rust_protobuf_library", "rust_protobuf_library_prost_0134")
+load("@fbcode//buck2:proto_defs.bzl", "proto_srcs", "rust_protobuf_library")
 load("@fbcode//grpc_fb/codegen:buck_macros.bzl", "grpc_library")
 load("@fbcode_macros//build_defs/lib:oss.bzl", "translate_target")
 
@@ -11,16 +11,6 @@ rust_protobuf_library(
     proto_srcs = ":buck2_worker_proto.proto",
 )
 
-# Have to maintain both of these in parallel so long as
-# fbcode//overqueued:overqueued_buck2_client is on older prost
-rust_protobuf_library_prost_0134(
-    name = "buck2_worker_proto_modern_prost",
-    srcs = glob(["src/**/*.rs"]),
-    build_script = "build.rs",
-    crate_name = "buck2_worker_proto",
-    proto_srcs = ":buck2_worker_proto.proto",
-)
-
 proto_srcs(
     name = "buck2_worker_proto.proto",
     srcs = ["worker.proto"],
diff --git a/proto_defs.bzl b/proto_defs.bzl
@@ -25,40 +25,6 @@ def rust_protobuf_library(
         srcs,
         build_script,
         "buck2_protoc_dev",
-        "0.12",
-        protos,
-        [
-            "fbsource//third-party/rust:tonic-0-10",
-        ] + (deps or []),
-        test_deps,
-        doctests,
-        build_env,
-        proto_srcs,
-        None,
-    )
-
-    # Set up an alias to the default version of prost to avoid breaking callers
-    alias(
-        name = name,
-        actual = ":" + name + "_prost",
-    )
-
-def rust_protobuf_library_prost_0134(
-        name,
-        srcs,
-        build_script,
-        protos = None,  # Pass a list of files. Thye'll be placed in the cwd. Prefer using proto_srcs.
-        deps = None,
-        test_deps = None,
-        doctests = True,
-        build_env = None,
-        proto_srcs = None,  # Use a proto_srcs() target, path is exposed as BUCK_PROTO_SRCS.
-        crate_name = None):
-    _rust_protobuf_library(
-        name,
-        srcs,
-        build_script,
-        "buck2_protoc_dev-tonic-0-12-3",
         "0.13",
         protos,
         [
@@ -68,13 +34,13 @@ def rust_protobuf_library_prost_0134(
         doctests,
         build_env,
         proto_srcs,
-        crate_name,
+        None,
     )
 
     # Set up an alias to the default version of prost to avoid breaking callers
     alias(
         name = name,
-        actual = ":" + name + "_prost-0-13-4",
+        actual = ":" + name + "_prost",
     )
 
 def _rust_protobuf_library(
@@ -91,8 +57,7 @@ def _rust_protobuf_library(
         proto_srcs,
         crate_name):
     versioned_prost_target = {
-        "0.12": "prost",
-        "0.13": "prost-0-13-4",
+        "0.13": "prost",
     }[prost_version]
     build_name = name + "-build" + "-" + versioned_prost_target
     proto_name = name + "-proto" + "-" + versioned_prost_target
@@ -125,7 +90,6 @@ def _rust_protobuf_library(
     )
 
     new_deps = [{
-        "0.12": "fbsource//third-party/rust:prost-0-12",
         "0.13": "fbsource//third-party/rust:prost-0-13",
     }[prost_version]] + (deps or [])
 
diff --git a/remote_execution/oss/re_grpc_proto/BUCK b/remote_execution/oss/re_grpc_proto/BUCK
@@ -1,8 +1,8 @@
-load("@fbcode//buck2:proto_defs.bzl", "rust_protobuf_library_prost_0134")
+load("@fbcode//buck2:proto_defs.bzl", "rust_protobuf_library")
 
 oncall("build_infra")
 
-rust_protobuf_library_prost_0134(
+rust_protobuf_library(
     name = "re_grpc_proto",
     srcs = glob(["src/**/*.rs"]),
     build_script = "build.rs",
diff --git a/shim/buck2/proto_defs.bzl b/shim/buck2/proto_defs.bzl
@@ -10,9 +10,7 @@ load(
     "@shim//:shims.bzl",
     _proto_srcs = "proto_srcs",
     _rust_protobuf_library = "rust_protobuf_library",
-    _rust_protobuf_library_prost_0134 = "rust_protobuf_library_prost_0134",
 )
 
 rust_protobuf_library = _rust_protobuf_library
-rust_protobuf_library_prost_0134 = _rust_protobuf_library_prost_0134
 proto_srcs = _proto_srcs
diff --git a/shim/shims.bzl b/shim/shims.bzl
@@ -363,35 +363,6 @@ def rust_protobuf_library(
         crate_name,
     )
 
-def rust_protobuf_library_prost_0134(
-        name,
-        srcs,
-        build_script,
-        protos = None,  # Pass a list of files. They'll be placed in the cwd. Prefer using proto_srcs.
-        deps = None,
-        test_deps = None,
-        doctests = True,
-        build_env = None,
-        proto_srcs = None,
-        crate_name = None):
-    # Use a proto_srcs() target, path is exposed as BUCK_PROTO_SRCS.
-    _rust_protobuf_library(
-        name,
-        srcs,
-        build_script,
-        "buck2_protoc_dev-tonic-0-12-3",
-        "prost-0-13-4",
-        "prost-types-0-13-4",
-        "tonic-0-12-3",
-        protos,
-        deps,
-        test_deps,
-        doctests,
-        build_env,
-        proto_srcs,
-        crate_name,
-    )
-
 def _rust_protobuf_library(
         name,
         srcs,
