diff options
author | Florian Klink <flokli@flokli.de> | 2023-06-12T13·04+0300 |
---|---|---|
committer | flokli <flokli@flokli.de> | 2023-06-12T13·27+0000 |
commit | b5e37869e6ddddf0575bdc98e0f4cc05753f0fc0 (patch) | |
tree | 92aeb382accb472ab935ec1f097c0dd6a547e27c /tvix/store/src/proto/grpc_pathinfoservice_wrapper.rs | |
parent | 64a4f6185c5dcd96ee57978963324ea50f4dd6f7 (diff) |
refactor(tvix/store/pathinfosvc): use Arc<dyn …> r/6279
This removes the use of generics, like previously done with Blob and Directory services. Change-Id: I7cc8bd1439b026c88e80c11e38aafc63c74e5e84 Reviewed-on: https://cl.tvl.fyi/c/depot/+/8751 Tested-by: BuildkiteCI Autosubmit: flokli <flokli@flokli.de> Reviewed-by: tazjin <tazjin@tvl.su>
Diffstat (limited to 'tvix/store/src/proto/grpc_pathinfoservice_wrapper.rs')
-rw-r--r-- | tvix/store/src/proto/grpc_pathinfoservice_wrapper.rs | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/tvix/store/src/proto/grpc_pathinfoservice_wrapper.rs b/tvix/store/src/proto/grpc_pathinfoservice_wrapper.rs index 645f4aa60556..9f26da213bd5 100644 --- a/tvix/store/src/proto/grpc_pathinfoservice_wrapper.rs +++ b/tvix/store/src/proto/grpc_pathinfoservice_wrapper.rs @@ -1,15 +1,16 @@ use crate::nar::RenderError; use crate::pathinfoservice::PathInfoService; use crate::proto; +use std::sync::Arc; use tonic::{async_trait, Request, Response, Result, Status}; use tracing::{instrument, warn}; -pub struct GRPCPathInfoServiceWrapper<PS: PathInfoService> { - path_info_service: PS, +pub struct GRPCPathInfoServiceWrapper { + path_info_service: Arc<dyn PathInfoService>, } -impl<PS: PathInfoService> From<PS> for GRPCPathInfoServiceWrapper<PS> { - fn from(value: PS) -> Self { +impl From<Arc<dyn PathInfoService>> for GRPCPathInfoServiceWrapper { + fn from(value: Arc<dyn PathInfoService>) -> Self { Self { path_info_service: value, } @@ -17,9 +18,7 @@ impl<PS: PathInfoService> From<PS> for GRPCPathInfoServiceWrapper<PS> { } #[async_trait] -impl<PS: PathInfoService + Send + Sync + 'static> proto::path_info_service_server::PathInfoService - for GRPCPathInfoServiceWrapper<PS> -{ +impl proto::path_info_service_server::PathInfoService for GRPCPathInfoServiceWrapper { #[instrument(skip(self))] async fn get( &self, |