diff options
| author | Ilan Joselevich <personal@ilanjoselevich.com> | 2024-07-09T13·06+0200 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2024-07-09T13·24+0000 |
| commit | 4f7b19701cedc8fe85b94b8fc192e8d05ecc4605 (patch) | |
| tree | 1280380c87ff73960c4f97939a343f621e37abae /tvix | |
| parent | 6d7713572f35e804fbd04b486902bf535fddb6e0 (diff) | |
fix(tvix/{store,castore,build}): Compile tonic w/o config in build.rs r/8360
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 <personal@ilanjoselevich.com> Tested-by: BuildkiteCI Reviewed-by: flokli <flokli@flokli.de>
Diffstat (limited to 'tvix')
| -rw-r--r-- | tvix/build/build.rs | 10 | ||||
| -rw-r--r-- | tvix/castore/build.rs | 10 | ||||
| -rw-r--r-- | 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 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", |