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

Add an umbrella impl for Service for types that Deref to Service.

Browse Source 
This means clients can only impl Service for types they define themselves, e.g. no longer for ()
This commit is contained in:
Tim Kuehn
2016-01-24 16:35:20 -08:00
parent ce12f4a981
commit c3be60565b
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tarpc/src/lib.rs
View File

@@ -19,7 +19,8 @@
//! use self::my_server::*;
//! use std::time::Duration;
//!
//! impl my_server::Service for () {
//! struct Server;
//! impl my_server::Service for Server {
//! fn hello(&self, s: String) -> String {
//! format!("Hello, {}!", s)
//! }
@@ -30,8 +31,10 @@
//!
//! fn main() {
//! let addr = "127.0.0.1:9000";
//! let shutdown = my_server::serve(addr, (),
//! Some(Duration::from_secs(30))).unwrap();
//! let shutdown = my_server::serve(addr,
//! Server,
//! Some(Duration::from_secs(30)))
//! .unwrap();
//! let client = Client::new(addr, None).unwrap();
//! assert_eq!(3, client.add(1, 2).unwrap());
//! assert_eq!("Hello, Mom!".to_string(),

16
tarpc/src/macros.rs
View File

@@ -190,6 +190,17 @@ macro_rules! rpc {
)*
}
impl<P> Service for P
where P: Send + Sync + ::std::ops::Deref<Target=Service>
{
$(
$(#[$attr])*
fn $fn_name(&self, $($arg:$in_),*) -> $out {
Service::$fn_name(&**self, $($arg),*)
}
)*
}
define_request!($($fn_name($($in_),*))*);
#[allow(non_camel_case_types)]
@@ -283,7 +294,8 @@ mod test {
use self::my_server::*;
impl Service for () {
struct Server;
impl Service for Server {
fn hello(&self, s: Foo) -> Foo {
Foo { message: format!("Hello, {}", &s.message) }
}
@@ -297,7 +309,7 @@ mod test {
fn simple_test() {
println!("Starting");
let addr = "127.0.0.1:9000";
let shutdown = my_server::serve(addr, (), test_timeout()).unwrap();
let shutdown = my_server::serve(addr, Server, test_timeout()).unwrap();
let client = Client::new(addr, None).unwrap();
assert_eq!(3, client.add(1, 2).unwrap());
let foo = Foo { message: "Adam".into() };