Use tonic for rust proto and grpc. Updates to handle dependency chains.

WORKSPACE

@@ -281,7 +281,7 @@ load("@rules_rust//crate_universe:repositories.bzl", "crate_universe_dependencie
 
 crate_universe_dependencies(bootstrap = True)
 
-load("//rust/crates:crates.bzl", "crate_repositories")
+load("//rust:crate_deps.bzl", "crate_repositories")
 
 crate_repositories()
 

example/rust/rust_prost_proto_compile/BUILD.bazel

@@ -1,16 +1,31 @@
 load("@rules_proto_grpc//rust:defs.bzl", "rust_prost_proto_compile")
 
 rust_prost_proto_compile(
-    name = "person_rust_proto",
+    name = "person_prost",
+    declared_proto_packages = ["example.proto"],
+    options = {
+        "//rust:rust_prost_plugin": ["type_attribute=.other.space.Person=#[derive(Eq\\,Hash)]"],
+    },
     protos = ["@rules_proto_grpc//example/proto:person_proto"],
 )
 
 rust_prost_proto_compile(
-    name = "place_rust_proto",
+    name = "place_prost",
+    declared_proto_packages = ["example.proto"],
+    options = {
+        "//rust:rust_prost_plugin": ["type_attribute=.other.space.Place=#[derive(Eq\\,Hash)]"],
+    },
     protos = ["@rules_proto_grpc//example/proto:place_proto"],
+
+    prost_proto_deps = []
 )
 
 rust_prost_proto_compile(
-    name = "thing_rust_proto",
+    name = "thing_prost",
+    declared_proto_packages = ["example.proto"],
+    options = {
+        # Known limitation, can't derive if the type contains a pbjson type.
+        # "//rust:rust_prost_plugin": ["type_attribute=.other.space.Thing=#[derive(Eq\\,Hash)]"],
+    },
     protos = ["@rules_proto_grpc//example/proto:thing_proto"],
-)
+)

example/rust/rust_prost_proto_compile/WORKSPACE

@@ -4,27 +4,24 @@ local_repository(
 )
 
 load("@rules_proto_grpc//:repositories.bzl", "rules_proto_grpc_repos", "rules_proto_grpc_toolchains")
-
 rules_proto_grpc_toolchains()
-
 rules_proto_grpc_repos()
 
 load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
-
 rules_proto_dependencies()
-
 rules_proto_toolchains()
 
-load("@rules_proto_grpc//rust:repositories.bzl", rules_proto_grpc_rust_repos = "rust_repos")
-
-rules_proto_grpc_rust_repos()
+load("@rules_proto_grpc//rust:repositories.bzl", "rust_repos")
+rust_repos()
 
 load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
-
 grpc_deps()
 
 load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_register_toolchains")
-
 rules_rust_dependencies()
-
 rust_register_toolchains(edition = "2021")
+
+load("@rules_rust//crate_universe:repositories.bzl", "crate_universe_dependencies")
+crate_universe_dependencies(bootstrap = True)
+load("@rules_proto_grpc//rust:crate_deps.bzl", "crate_repositories")
+crate_repositories()

example/rust/rust_prost_proto_library/BUILD.bazel

@@ -1,10 +1,32 @@
 load("@rules_proto_grpc//rust:defs.bzl", "rust_prost_proto_library")
 
+
 rust_prost_proto_library(
-    name = "proto_rust_prost_proto",
+    name = "personplace_prost",
+    declared_proto_packages = ["example.proto"],
     protos = [
         "@rules_proto_grpc//example/proto:person_proto",
         "@rules_proto_grpc//example/proto:place_proto",
-        "@rules_proto_grpc//example/proto:thing_proto",
     ],
+    options = {
+        "//rust:rust_prost_plugin": [
+            "type_attribute=.example.proto.Person=#[derive(Eq\\,Hash)]",
+            "type_attribute=.example.proto.Place=#[derive(Eq\\,Hash)]",
+    ]},
+    prost_proto_deps = [
+        ":thing_prost"
+    ]
 )
+
+rust_prost_proto_library(
+    name = "thing_prost",
+    declared_proto_packages = ["example.proto"],
+    protos = [
+        "@rules_proto_grpc//example/proto:thing_proto",
+    ],
+    options = {
+        "//rust:rust_prost_plugin": [
+            # Intentionally Ommitted.
+            # "type_attribute=.example.proto.Thing=#[derive(Eq\\,Hash)]",
+    ]}
+)

example/rust/rust_prost_proto_library/WORKSPACE

@@ -4,27 +4,24 @@ local_repository(
 )
 
 load("@rules_proto_grpc//:repositories.bzl", "rules_proto_grpc_repos", "rules_proto_grpc_toolchains")
-
 rules_proto_grpc_toolchains()
-
 rules_proto_grpc_repos()
 
 load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
-
 rules_proto_dependencies()
-
 rules_proto_toolchains()
 
-load("@rules_proto_grpc//rust:repositories.bzl", rules_proto_grpc_rust_repos = "rust_repos")
-
-rules_proto_grpc_rust_repos()
+load("@rules_proto_grpc//rust:repositories.bzl", "rust_repos")
+rust_repos()
 
 load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
-
 grpc_deps()
 
 load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_register_toolchains")
-
 rules_rust_dependencies()
-
 rust_register_toolchains(edition = "2021")
+
+load("@rules_rust//crate_universe:repositories.bzl", "crate_universe_dependencies")
+crate_universe_dependencies(bootstrap = True)
+load("@rules_proto_grpc//rust:crate_deps.bzl", "crate_repositories")
+crate_repositories()

example/rust/rust_tonic_grpc_compile/BUILD.bazel

@@ -1,11 +1,12 @@
-load("@rules_proto_grpc//rust:defs.bzl", "rust_tonic_grpc_compile")
+load("@rules_proto_grpc//rust:defs.bzl", "rust_tonic_grpc_compile", )
 
 rust_tonic_grpc_compile(
-    name = "thing_rust_grpc",
-    protos = ["@rules_proto_grpc//example/proto:thing_proto"],
-)
-
-rust_tonic_grpc_compile(
-    name = "greeter_rust_grpc",
-    protos = ["@rules_proto_grpc//example/proto:greeter_grpc"],
-)
+    name = "greeter_tonic",
+    declared_proto_packages = ["example.proto"],
+    protos = [
+        "@rules_proto_grpc//example/proto:greeter_grpc",
+        "@rules_proto_grpc//example/proto:person_proto",
+        "@rules_proto_grpc//example/proto:place_proto",
+        "@rules_proto_grpc//example/proto:thing_proto",
+    ]
+)

example/rust/rust_tonic_grpc_compile/WORKSPACE

@@ -4,27 +4,24 @@ local_repository(
 )
 
 load("@rules_proto_grpc//:repositories.bzl", "rules_proto_grpc_repos", "rules_proto_grpc_toolchains")
-
 rules_proto_grpc_toolchains()
-
 rules_proto_grpc_repos()
 
 load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
-
 rules_proto_dependencies()
-
 rules_proto_toolchains()
 
-load("@rules_proto_grpc//rust:repositories.bzl", rules_proto_grpc_rust_repos = "rust_repos")
-
-rules_proto_grpc_rust_repos()
+load("@rules_proto_grpc//rust:repositories.bzl", "rust_repos")
+rust_repos()
 
 load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
-
 grpc_deps()
 
 load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_register_toolchains")
-
 rules_rust_dependencies()
-
 rust_register_toolchains(edition = "2021")
+
+load("@rules_rust//crate_universe:repositories.bzl", "crate_universe_dependencies")
+crate_universe_dependencies(bootstrap = True)
+load("@rules_proto_grpc//rust:crate_deps.bzl", "crate_repositories")
+crate_repositories()

example/rust/rust_tonic_grpc_library/BUILD.bazel

@@ -1,9 +1,25 @@
-load("@rules_proto_grpc//rust:defs.bzl", "rust_tonic_grpc_library")
+load("@rules_proto_grpc//rust:defs.bzl", "rust_tonic_grpc_library", "rust_prost_proto_library")
+
 
 rust_tonic_grpc_library(
-    name = "greeter_rust_tonic_grpc",
+    name = "greeter_tonic",
+    declared_proto_packages = ["example.proto"],
     protos = [
         "@rules_proto_grpc//example/proto:greeter_grpc",
+        "@rules_proto_grpc//example/proto:person_proto",
+        "@rules_proto_grpc//example/proto:place_proto",
         "@rules_proto_grpc//example/proto:thing_proto",
     ],
+    options = {
+        "//rust:rust_prost_plugin": [
+            "type_attribute=.example.proto.Person=#[derive(Eq\\,Hash)]",
+            "type_attribute=.example.proto.Place=#[derive(Eq\\,Hash)]",
+    ]},
 )
+# rust_prost_proto_library(
+#     name = "thing_prost",
+#     declared_proto_packages = ["example.proto"],
+#     protos = [
+#         "@rules_proto_grpc//example/proto:thing_proto",
+#     ],
+# )