diff options
| author | Yureka <tvl@yuka.dev> | 2024-07-20T18·15+0200 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2024-07-21T11·01+0000 |
| commit | ca8e2b9fbf4e58416655f237db02a331d0bc1f3d (patch) | |
| tree | 0c14bd4a21e5367600cc9d0bcda563a33a879538 /tvix/store | |
| parent | 1515a970bedbb6d7b5e8f966dddd0d8fff9bb03c (diff) | |
chore(tvix): upgrade to tonic 0.12 / hyper 1.0 r/8385
Change-Id: Idd8ce48869ddd869d51a10959b920f1290a8a9b3 Reviewed-on: https://cl.tvl.fyi/c/depot/+/11991 Autosubmit: yuka <yuka@yuka.dev> Reviewed-by: flokli <flokli@flokli.de> Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/store')
| -rw-r--r-- | tvix/store/Cargo.toml | 19 | ||||
| -rw-r--r-- | tvix/store/src/pathinfoservice/tests/utils.rs | 3 |
2 files changed, 12 insertions, 10 deletions
diff --git a/tvix/store/Cargo.toml b/tvix/store/Cargo.toml index 8063a0e874c3..f1d88ba085ea 100644 --- a/tvix/store/Cargo.toml +++ b/tvix/store/Cargo.toml @@ -17,7 +17,7 @@ futures = "0.3.30" lazy_static = "1.4.0" nix-compat = { path = "../nix-compat", features = ["async"] } pin-project-lite = "0.2.13" -prost = "0.12.1" +prost = "0.13.1" serde = { version = "1.0.197", features = [ "derive" ] } serde_json = "1.0" serde_with = "3.7.0" @@ -26,34 +26,35 @@ sha2 = "0.10.6" sled = { version = "0.34.7" } thiserror = "1.0.38" tokio = { version = "1.32.0", features = ["fs", "macros", "net", "rt", "rt-multi-thread", "signal"] } -tokio-listener = { version = "0.4.2", features = [ "clap", "multi-listener", "sd_listen", "tonic011" ] } +tokio-listener = { version = "0.4.2", features = [ "clap", "multi-listener", "sd_listen", "tonic012" ] } tokio-stream = { version = "0.1.14", features = ["fs"] } tokio-util = { version = "0.7.9", features = ["io", "io-util", "compat"] } -tonic = { version = "0.11.0", features = ["tls", "tls-roots"] } +tonic = { version = "0.12.0", features = ["tls", "tls-roots"] } tower = "0.4.13" -tower-http = { version = "0.4.4", features = ["trace"] } +tower-http = { version = "0.5.0", features = ["trace"] } tvix-castore = { path = "../castore" } url = "2.4.0" walkdir = "2.4.0" -reqwest = { version = "0.11.22", features = ["rustls-tls-native-roots", "stream"], default-features = false } -reqwest-middleware = "0.2.5" +reqwest = { version = "0.12.0", features = ["rustls-tls-native-roots", "stream"], default-features = false } +reqwest-middleware = "0.3.0" lru = "0.12.3" parking_lot = "0.12.2" tvix-tracing = { path = "../tracing", features = ["tonic", "reqwest"] } tracing = "0.1.40" tracing-indicatif = "0.3.6" +hyper-util = "0.1.6" [dependencies.tonic-reflection] optional = true -version = "0.11.0" +version = "0.12.0" [dependencies.bigtable_rs] optional = true version = "0.2.10" [build-dependencies] -prost-build = "0.12.1" -tonic-build = "0.11.0" +prost-build = "0.13.1" +tonic-build = "0.12.0" [dev-dependencies] async-process = "2.1.0" diff --git a/tvix/store/src/pathinfoservice/tests/utils.rs b/tvix/store/src/pathinfoservice/tests/utils.rs index 3e4fe5c05a24..8b192e303b89 100644 --- a/tvix/store/src/pathinfoservice/tests/utils.rs +++ b/tvix/store/src/pathinfoservice/tests/utils.rs @@ -1,5 +1,6 @@ use std::sync::Arc; +use hyper_util::rt::TokioIo; use tonic::transport::{Endpoint, Server, Uri}; use tvix_castore::{blobservice::BlobService, directoryservice::DirectoryService}; @@ -57,7 +58,7 @@ pub async fn make_grpc_path_info_service_client() -> ( .unwrap() .connect_with_connector(tower::service_fn(move |_: Uri| { let right = maybe_right.take().unwrap(); - async move { Ok::<_, std::io::Error>(right) } + async move { Ok::<_, std::io::Error>(TokioIo::new(right)) } })) .await .unwrap(), |