diff options
| author | Florian Klink <flokli@flokli.de> | 2023-09-26T07·30+0300 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2023-09-26T10·07+0000 |
| commit | 6b02800e486a46e28d6bec79ba3ba94fe006e8c5 (patch) | |
| tree | c4618647fcae77581956a065d5809f3186e386ad /tvix/castore | |
| parent | 329067f62954f09bcaf87a016f4211fdcf9789dd (diff) | |
chore(tvix/[ca]store): allow building without tonic-reflection r/6660
- rename the feature to `tonic-reflection` in both tvix-store and tvix- castore. - set it to disabled in tvix-castore by default - enable it in tvix-store, and pull in tvix-castore with the feature enabled. Change-Id: Ie22833d85569502cae55812f6eeb17a9c15b9e2c Reviewed-on: https://cl.tvl.fyi/c/depot/+/9472 Autosubmit: flokli <flokli@flokli.de> Tested-by: BuildkiteCI Reviewed-by: raitobezarius <tvl@lahfa.xyz>
Diffstat (limited to 'tvix/castore')
| -rw-r--r-- | tvix/castore/Cargo.toml | 4 | ||||
| -rw-r--r-- | tvix/castore/build.rs | 2 | ||||
| -rw-r--r-- | tvix/castore/src/proto/mod.rs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tvix/castore/Cargo.toml b/tvix/castore/Cargo.toml index 5ad61d08b188..3cf1355e7241 100644 --- a/tvix/castore/Cargo.toml +++ b/tvix/castore/Cargo.toml @@ -37,5 +37,5 @@ tempfile = "3.3.0" tonic-mock = { git = "https://github.com/brainrake/tonic-mock", branch = "bump-dependencies" } [features] -default = ["reflection"] -reflection = ["tonic-reflection"] \ No newline at end of file +default = [] +tonic-reflection = ["dep:tonic-reflection"] \ No newline at end of file diff --git a/tvix/castore/build.rs b/tvix/castore/build.rs index 9f06c8833319..339ba867dd21 100644 --- a/tvix/castore/build.rs +++ b/tvix/castore/build.rs @@ -4,7 +4,7 @@ fn main() -> Result<()> { #[allow(unused_mut)] let mut builder = tonic_build::configure(); - #[cfg(feature = "reflection")] + #[cfg(feature = "tonic-reflection")] { let out_dir = std::path::PathBuf::from(std::env::var("OUT_DIR").unwrap()); let descriptor_path = out_dir.join("tvix.castore.v1.bin"); diff --git a/tvix/castore/src/proto/mod.rs b/tvix/castore/src/proto/mod.rs index 2a44383fdd85..0737f3f08443 100644 --- a/tvix/castore/src/proto/mod.rs +++ b/tvix/castore/src/proto/mod.rs @@ -16,7 +16,7 @@ use crate::B3Digest; tonic::include_proto!("tvix.castore.v1"); -#[cfg(feature = "reflection")] +#[cfg(feature = "tonic-reflection")] /// Compiled file descriptors for implementing [gRPC /// reflection](https://github.com/grpc/grpc/blob/master/doc/server-reflection.md) with e.g. /// [`tonic_reflection`](https://docs.rs/tonic-reflection). |