about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2024-06-20T17·57+0300
committerflokli <flokli@flokli.de>2024-06-20T21·07+0000
commit7f625e2fc104a9403c0a0eb2c6abe975948dada3 (patch)
tree3942b85fc1e44554ef3ec7948c9f9b32ca640911
parent639a00e2ab1f2a6530477d2d7f91cccbc9f70746 (diff)
refactor(tvix/*store): remove some trait bounds r/8300
We don't need to require these things for these impl blocks yet.

Change-Id: I3cec958a637a4f900bdd38abd00e9133bf75ce46
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11865
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: Simon Hauser <simon.hauser@helsinki-systems.de>
Tested-by: BuildkiteCI
-rw-r--r--tvix/castore/src/blobservice/grpc.rs10
-rw-r--r--tvix/castore/src/directoryservice/grpc.rs10
-rw-r--r--tvix/store/src/pathinfoservice/grpc.rs10
3 files changed, 6 insertions, 24 deletions
diff --git a/tvix/castore/src/blobservice/grpc.rs b/tvix/castore/src/blobservice/grpc.rs
index 9b54d81de29c..834c0c7bf57a 100644
--- a/tvix/castore/src/blobservice/grpc.rs
+++ b/tvix/castore/src/blobservice/grpc.rs
@@ -22,19 +22,13 @@ use tracing::{instrument, Instrument as _};
 
 /// Connects to a (remote) tvix-store BlobService over gRPC.
 #[derive(Clone)]
-pub struct GRPCBlobService<T>
-where
-    T: Clone,
-{
+pub struct GRPCBlobService<T> {
     /// The internal reference to a gRPC client.
     /// Cloning it is cheap, and it internally handles concurrent requests.
     grpc_client: proto::blob_service_client::BlobServiceClient<T>,
 }
 
-impl<T> GRPCBlobService<T>
-where
-    T: tonic::client::GrpcService<tonic::body::BoxBody> + Clone,
-{
+impl<T> GRPCBlobService<T> {
     /// construct a [GRPCBlobService] from a [proto::blob_service_client::BlobServiceClient].
     /// panics if called outside the context of a tokio runtime.
     pub fn from_client(grpc_client: proto::blob_service_client::BlobServiceClient<T>) -> Self {
diff --git a/tvix/castore/src/directoryservice/grpc.rs b/tvix/castore/src/directoryservice/grpc.rs
index 54d7575adcc1..ca9b0de07b14 100644
--- a/tvix/castore/src/directoryservice/grpc.rs
+++ b/tvix/castore/src/directoryservice/grpc.rs
@@ -14,19 +14,13 @@ use tracing::{instrument, warn, Instrument as _};
 
 /// Connects to a (remote) tvix-store DirectoryService over gRPC.
 #[derive(Clone)]
-pub struct GRPCDirectoryService<T>
-where
-    T: Clone,
-{
+pub struct GRPCDirectoryService<T> {
     /// The internal reference to a gRPC client.
     /// Cloning it is cheap, and it internally handles concurrent requests.
     grpc_client: proto::directory_service_client::DirectoryServiceClient<T>,
 }
 
-impl<T> GRPCDirectoryService<T>
-where
-    T: tonic::client::GrpcService<tonic::body::BoxBody> + Clone,
-{
+impl<T> GRPCDirectoryService<T> {
     /// construct a [GRPCDirectoryService] from a [proto::directory_service_client::DirectoryServiceClient].
     /// panics if called outside the context of a tokio runtime.
     pub fn from_client(
diff --git a/tvix/store/src/pathinfoservice/grpc.rs b/tvix/store/src/pathinfoservice/grpc.rs
index 152bf69a05ac..bcee49aac6cf 100644
--- a/tvix/store/src/pathinfoservice/grpc.rs
+++ b/tvix/store/src/pathinfoservice/grpc.rs
@@ -13,19 +13,13 @@ use tvix_castore::{proto as castorepb, Error};
 
 /// Connects to a (remote) tvix-store PathInfoService over gRPC.
 #[derive(Clone)]
-pub struct GRPCPathInfoService<T>
-where
-    T: Clone,
-{
+pub struct GRPCPathInfoService<T> {
     /// The internal reference to a gRPC client.
     /// Cloning it is cheap, and it internally handles concurrent requests.
     grpc_client: proto::path_info_service_client::PathInfoServiceClient<T>,
 }
 
-impl<T> GRPCPathInfoService<T>
-where
-    T: tonic::client::GrpcService<tonic::body::BoxBody> + Clone,
-{
+impl<T> GRPCPathInfoService<T> {
     /// construct a [GRPCPathInfoService] from a [proto::path_info_service_client::PathInfoServiceClient].
     /// panics if called outside the context of a tokio runtime.
     pub fn from_client(