OMGeeky/tarpc
1
0
Fork 0
mirror of https://github.com/OMGeeky/tarpc.git synced 2026-01-04 02:21:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue where service fns with no args would cause compile errors

Browse Source
This commit is contained in:
Tim Kuehn
2016-01-11 00:51:24 -08:00
parent dca55d4310
commit 212f0bb7aa
2 changed files with 53 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib.rs
View File

@@ -35,7 +35,9 @@
//! }
//! ```
#![feature(trace_macros)]
#![feature(const_fn)]
#![feature(braced_empty_structs)]
#![feature(custom_derive, plugin)]
#![plugin(serde_macros)]
#![deny(missing_docs)]

71
src/macros.rs
View File

@@ -1,4 +1,46 @@
//! Provides a macro for creating an rpc service and client stub.
#[macro_export]
macro_rules! as_item { ($i:item) => {$i} }
#[macro_export]
macro_rules! request_fns {
($fn_name:ident( $( $arg:ident : $in_:ty ),* ) -> $out:ty) => (
pub fn $fn_name(&self, $($arg: $in_),*) -> Result<$out> {
let reply = try!((self.0).rpc(&request_variant!($fn_name $($arg),*)));
let Reply::$fn_name(reply) = reply;
Ok(reply)
}
);
($( $fn_name:ident( $( $arg:ident : $in_:ty ),* ) -> $out:ty)*) => ( $(
pub fn $fn_name(&self, $($arg: $in_),*) -> Result<$out> {
let reply = try!((self.0).rpc(&request_variant!($fn_name $($arg),*)));
if let Reply::$fn_name(reply) = reply {
Ok(reply)
} else {
Err(Error::InternalError)
}
}
)*);
}
#[macro_export]
macro_rules! define_request {
($(@($($finished:tt)*))* --) => (as_item!(
#[allow(non_camel_case_types)]
#[derive(Debug, Serialize, Deserialize)]
enum Request { $($($finished)*),* }
););
($(@$finished:tt)* -- $name:ident() $($req:tt)*) =>
(define_request!($(@$finished)* @($name) -- $($req)*););
($(@$finished:tt)* -- $name:ident $args: tt $($req:tt)*) =>
(define_request!($(@$finished)* @($name $args) -- $($req)*););
($($started:tt)*) => (define_request!(-- $($started)*););
}
#[macro_export]
macro_rules! request_variant {
($x:ident) => (Request::$x);
($x:ident $($y:ident),+) => (Request::$x($($y),+));
}
#[macro_export]
macro_rules! rpc_service { ($server:ident:
@@ -49,13 +91,7 @@ macro_rules! rpc_service { ($server:ident:
)*
}
#[allow(non_camel_case_types)]
#[derive(Debug, Serialize, Deserialize)]
enum Request {
$(
$fn_name($($in_),*),
)*
}
define_request!($($fn_name($($in_),*))*);
#[allow(non_camel_case_types)]
#[derive(Debug, Serialize, Deserialize)]
@@ -63,7 +99,6 @@ macro_rules! rpc_service { ($server:ident:
$(
$fn_name($out),
)*
Impossible,
}
#[doc="The client stub that makes RPC calls to the server."]
@@ -78,16 +113,7 @@ macro_rules! rpc_service { ($server:ident:
Ok(Client(inner))
}
$(
pub fn $fn_name(&self, $($arg: $in_),*) -> Result<$out> {
let reply = try!((self.0).rpc(&Request::$fn_name($($arg),*)));
if let Reply::$fn_name(reply) = reply {
Ok(reply)
} else {
Err(Error::InternalError)
}
}
)*
request_fns!($($fn_name($($arg: $in_),*) -> $out)*);
}
struct Server<S: 'static + Service>(S);
@@ -98,7 +124,7 @@ macro_rules! rpc_service { ($server:ident:
fn serve(&self, request: Request) -> Reply {
match request {
$(
Request::$fn_name($($arg),*) =>
request_variant!($fn_name $($arg),*) =>
Reply::$fn_name((self.0).$fn_name($($arg),*)),
)*
}
@@ -156,4 +182,9 @@ mod test {
drop(client);
shutdown.shutdown();
}
// This is a test of a service with a fn that takes no args
rpc_service! {foo:
hello() -> String;
}
}