about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--tvix/build/build.rs10
-rw-r--r--tvix/castore/build.rs10
-rw-r--r--tvix/store/build.rs10
3 files changed, 9 insertions, 21 deletions
diff --git a/tvix/build/build.rs b/tvix/build/build.rs
index c3518ea8772b..09604c3e3b71 100644
--- a/tvix/build/build.rs
+++ b/tvix/build/build.rs
@@ -12,17 +12,13 @@ fn main() -> Result<()> {
         builder = builder.file_descriptor_set_path(descriptor_path);
     };
 
-    // https://github.com/hyperium/tonic/issues/908
-    let mut config = prost_build::Config::new();
-    config.bytes(["."]);
-    config.extern_path(".tvix.castore.v1", "::tvix_castore::proto");
-
     builder
         .build_server(true)
         .build_client(true)
         .emit_rerun_if_changed(false)
-        .compile_with_config(
-            config,
+        .bytes(["."])
+        .extern_path(".tvix.castore.v1", "::tvix_castore::proto")
+        .compile(
             &[
                 "tvix/build/protos/build.proto",
                 "tvix/build/protos/rpc_build.proto",
diff --git a/tvix/castore/build.rs b/tvix/castore/build.rs
index 089c093e71b4..98e2ab348528 100644
--- a/tvix/castore/build.rs
+++ b/tvix/castore/build.rs
@@ -12,17 +12,13 @@ fn main() -> Result<()> {
         builder = builder.file_descriptor_set_path(descriptor_path);
     };
 
-    // https://github.com/hyperium/tonic/issues/908
-    let mut config = prost_build::Config::new();
-    config.bytes(["."]);
-    config.type_attribute(".", "#[derive(Eq, Hash)]");
-
     builder
         .build_server(true)
         .build_client(true)
         .emit_rerun_if_changed(false)
-        .compile_with_config(
-            config,
+        .bytes(["."])
+        .type_attribute(".", "#[derive(Eq, Hash)]")
+        .compile(
             &[
                 "tvix/castore/protos/castore.proto",
                 "tvix/castore/protos/rpc_blobstore.proto",
diff --git a/tvix/store/build.rs b/tvix/store/build.rs
index 809fa29578b5..8a92ab26fd64 100644
--- a/tvix/store/build.rs
+++ b/tvix/store/build.rs
@@ -12,17 +12,13 @@ fn main() -> Result<()> {
         builder = builder.file_descriptor_set_path(descriptor_path);
     };
 
-    // https://github.com/hyperium/tonic/issues/908
-    let mut config = prost_build::Config::new();
-    config.bytes(["."]);
-    config.extern_path(".tvix.castore.v1", "::tvix_castore::proto");
-
     builder
         .build_server(true)
         .build_client(true)
         .emit_rerun_if_changed(false)
-        .compile_with_config(
-            config,
+        .bytes(["."])
+        .extern_path(".tvix.castore.v1", "::tvix_castore::proto")
+        .compile(
             &[
                 "tvix/store/protos/pathinfo.proto",
                 "tvix/store/protos/rpc_pathinfo.proto",