OMGeeky/tarpc
1
0
Fork 0
mirror of https://github.com/OMGeeky/tarpc.git synced 2025-12-28 07:12:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Client RPCs now take &self.

Browse Source 
This required the breaking change of removing the Client trait. The
intent of the Client trait was to facilitate the decorator pattern by
allowing users to create their own Clients that added behavior on top of
the base client. Unfortunately, this trait had become a maintenance
burden, consistently causing issues with lifetimes and the lack of
generic associated types. Specifically, it meant that Client impls could
not use async fns, which is no longer tenable today.
This commit is contained in:
Tim Kuehn
2021-03-07 17:33:31 -08:00
parent ce4fd49161
commit e75193c191
15 changed files with 114 additions and 453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
plugins/src/lib.rs
View File

@@ -664,26 +664,7 @@ impl<'a> ServiceGenerator<'a> {
#[derive(Clone, Debug)]
/// The client stub that makes RPC calls to the server. ALl request methods return
/// [Futures](std::future::Future).
#vis struct #client_ident<C = tarpc::client::Channel<#request_ident, #response_ident>>(C);
}
}
fn impl_from_for_client(&self) -> TokenStream2 {
let &Self {
client_ident,
request_ident,
response_ident,
..
} = self;
quote! {
impl<C> From<C> for #client_ident<C>
where for <'a> C: tarpc::Client<'a, #request_ident, Response = #response_ident>
{
fn from(client: C) -> Self {
#client_ident(client)
}
}
#vis struct #client_ident(tarpc::client::Channel<#request_ident, #response_ident>);
}
}
@@ -734,16 +715,14 @@ impl<'a> ServiceGenerator<'a> {
} = self;
quote! {
impl<C> #client_ident<C>
where for<'a> C: tarpc::Client<'a, #request_ident, Response = #response_ident>
{
impl #client_ident {
#(
#[allow(unused)]
#( #method_attrs )*
#vis fn #method_idents(&mut self, ctx: tarpc::context::Context, #( #args ),*)
#vis fn #method_idents(&self, ctx: tarpc::context::Context, #( #args ),*)
-> impl std::future::Future<Output = std::io::Result<#return_types>> + '_ {
let request = #request_ident::#camel_case_idents { #( #arg_pats ),* };
let resp = tarpc::Client::call(&mut self.0, ctx, request);
let resp = self.0.call(ctx, request);
async move {
match resp.await? {
#response_ident::#camel_case_idents(msg) => std::result::Result::Ok(msg),
@@ -769,7 +748,6 @@ impl<'a> ToTokens for ServiceGenerator<'a> {
self.impl_debug_for_response_future(),
self.impl_future_for_response_future(),
self.struct_client(),
self.impl_from_for_client(),
self.impl_client_new(),
self.impl_client_rpc_methods(),
])