From 4f7b19701cedc8fe85b94b8fc192e8d05ecc4605 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Tue, 9 Jul 2024 15:06:03 +0200 Subject: [PATCH] fix(tvix/{store,castore,build}): Compile tonic w/o config in build.rs Previously we had to make a mutable Config instance and set bytes and other values in it because they were not exposed to the builder pattern (https://github.com/hyperium/tonic/issues/908) but now they are, so we just set them through the builder. Change-Id: I8904c6b93f09173b56586024b1ced59d622bce66 Reviewed-on: https://cl.tvl.fyi/c/depot/+/11966 Autosubmit: Ilan Joselevich Tested-by: BuildkiteCI Reviewed-by: flokli --- tvix/build/build.rs | 10 +++------- tvix/castore/build.rs | 10 +++------- tvix/store/build.rs | 10 +++------- 3 files changed, 9 insertions(+), 21 deletions(-) diff --git a/tvix/build/build.rs b/tvix/build/build.rs index c3518ea87..09604c3e3 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 089c093e7..98e2ab348 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 809fa2957..8a92ab26f 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",