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

Update to serde 1.0 and bincode 0.8 (#149)

Browse Source
This commit is contained in:
Tim
2017-05-05 22:16:44 -07:00
committed by GitHub
parent 7dbfe07c97
commit 21e8883877
12 changed files with 80 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/sync/client.rs
View File

@@ -1,8 +1,8 @@
use future::client::{Client as FutureClient, ClientExt as FutureClientExt,
Options as FutureOptions};
/// Exposes a trait for connecting synchronously to servers.
use futures::{Future, Stream};
use serde::{Deserialize, Serialize};
use serde::Serialize;
use serde::de::DeserializeOwned;
use std::fmt;
use std::io;
use std::net::{SocketAddr, ToSocketAddrs};
@@ -35,8 +35,8 @@ impl<Req, Resp, E> fmt::Debug for Client<Req, Resp, E> {
impl<Req, Resp, E> Client<Req, Resp, E>
where Req: Serialize + Send + 'static,
Resp: Deserialize + Send + 'static,
E: Deserialize + Send + 'static
Resp: DeserializeOwned + Send + 'static,
E: DeserializeOwned + Send + 'static
{
/// Drives an RPC call for the given request.
pub fn call(&self, request: Req) -> Result<Resp, ::Error<E>> {
@@ -124,8 +124,8 @@ pub trait ClientExt: Sized {
impl<Req, Resp, E> ClientExt for Client<Req, Resp, E>
where Req: Serialize + Send + 'static,
Resp: Deserialize + Send + 'static,
E: Deserialize + Send + 'static
Resp: DeserializeOwned + Send + 'static,
E: DeserializeOwned + Send + 'static
{
fn connect<A>(addr: A, options: Options) -> io::Result<Self>
where A: ToSocketAddrs
@@ -154,8 +154,8 @@ struct RequestHandler<Req, Resp, E, S> {
impl<Req, Resp, E> RequestHandler<Req, Resp, E, FutureClient<Req, Resp, E>>
where Req: Serialize + Send + 'static,
Resp: Deserialize + Send + 'static,
E: Deserialize + Send + 'static
Resp: DeserializeOwned + Send + 'static,
E: DeserializeOwned + Send + 'static
{
/// Creates a new `RequestHandler` by connecting a `FutureClient` to the given address
/// using the given options.
@@ -175,8 +175,8 @@ impl<Req, Resp, E> RequestHandler<Req, Resp, E, FutureClient<Req, Resp, E>>
impl<Req, Resp, E, S> RequestHandler<Req, Resp, E, S>
where Req: Serialize + 'static,
Resp: Deserialize + 'static,
E: Deserialize + 'static,
Resp: DeserializeOwned + 'static,
E: DeserializeOwned + 'static,
S: Service<Request = Req, Response = Resp, Error = ::Error<E>>,
S::Future: 'static
{

5
src/sync/server.rs
View File

@@ -4,7 +4,8 @@ use futures::{Future, future as futures};
use futures::sync::oneshot;
#[cfg(feature = "tls")]
use native_tls_inner::TlsAcceptor;
use serde::{Deserialize, Serialize};
use serde::Serialize;
use serde::de::DeserializeOwned;
use std::fmt;
use std::io;
use std::net::SocketAddr;
@@ -110,7 +111,7 @@ pub fn listen<S, Req, Resp, E>(new_service: S,
<S::Instance as Service>::Future: Send + 'static,
S::Response: Send,
S::Error: Send,
Req: Deserialize + 'static,
Req: DeserializeOwned + 'static,
Resp: Serialize + 'static,
E: Serialize + 'static
{