Change module structure. (google#122)

* Change `client::{future, sync}, server::{future, sync}` to `future::{client, server}, sync::{client, server}`

This reflects the most common usage pattern and allows for some types to not need to be fully qualified when used together (e.g. the previously-named `client::future::Options` and `server::future::Options` can now be `client::Options` and `server::Options`).

* sync::client: create a RequestHandler struct to encapsulate logic of processing client requests.

The largest benefit is that unit testing becomes easier, e.g. testing that the request processing stops when all request senders are dropped.

* Rename Serialize error variants to make sense.

* Rename tarpc_service_ConnectFuture__ => Connect (because it's public)

* Use tokio proto's ClientProxy.

Rather than reimplement the same logic. Curiously, this commit
isn't a net loss in LOC. Oh well.

* Factor out os-specific functionality in listener() into their own fns

* Remove service-fn dep

Author: tikue

Cargo.toml

@@ -15,7 +15,7 @@ description = "An RPC framework for Rust with a focus on ease of use."
 travis-ci = { repository = "google/tarpc" }
 
 [dependencies]
-bincode = "1.0.0-alpha2"
+bincode = "1.0.0-alpha4"
 byteorder = "1.0"
 cfg-if = "0.1.0"
 futures = "0.1.7"

README.md

@@ -55,8 +55,8 @@ extern crate tarpc;
 
 use std::sync::mpsc;
 use std::thread;
-use tarpc::{client, server};
-use tarpc::client::sync::ClientExt;
+use tarpc::sync::{client, server};
+use tarpc::sync::client::ClientExt;
 use tarpc::util::{FirstSocketAddr, Never};
 
 service! {
@@ -109,8 +109,8 @@ extern crate tarpc;
 extern crate tokio_core;
 
 use futures::Future;
-use tarpc::{client, server};
-use tarpc::client::future::ClientExt;
+use tarpc::future::{client, server};
+use tarpc::future::client::ClientExt;
 use tarpc::util::{FirstSocketAddr, Never};
 use tokio_core::reactor;
 
@@ -180,8 +180,9 @@ extern crate tarpc;
 extern crate tokio_core;
 
 use futures::Future;
-use tarpc::{client, server};
-use tarpc::client::future::ClientExt;
+use tarpc::future::{client, server};
+use tarpc::future::client::ClientExt;
+use tarpc::tls;
 use tarpc::util::{FirstSocketAddr, Never};
 use tokio_core::reactor;
 use tarpc::native_tls::{Pkcs12, TlsAcceptor};
@@ -216,7 +217,7 @@ fn main() {
     reactor.handle().spawn(server);
     let options = client::Options::default()
                                    .handle(reactor.handle())
-                                   .tls(client::tls::Context::new("foobar.com").unwrap());
+                                   .tls(tls::client::Context::new("foobar.com").unwrap());
     reactor.run(FutureClient::connect(handle.addr(), options)
             .map_err(tarpc::Error::from)
             .and_then(|client| client.hello("Mom".to_string()))

benches/latency.rs

@@ -14,8 +14,8 @@ extern crate env_logger;
 extern crate futures;
 extern crate tokio_core;
 
-use tarpc::{client, server};
-use tarpc::client::future::ClientExt;
+use tarpc::future::{client, server};
+use tarpc::future::client::ClientExt;
 use tarpc::util::{FirstSocketAddr, Never};
 #[cfg(test)]
 use test::Bencher;

examples/concurrency.rs

@@ -25,8 +25,8 @@ use std::{cmp, thread};
 use std::sync::{Arc, mpsc};
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::time::{Duration, Instant};
-use tarpc::{client, server};
-use tarpc::client::future::ClientExt;
+use tarpc::future::{client, server};
+use tarpc::future::client::ClientExt;
 use tarpc::util::{FirstSocketAddr, Never};
 use tokio_core::reactor;
 

examples/pubsub.rs

@@ -21,8 +21,8 @@ use std::rc::Rc;
 use std::thread;
 use std::time::Duration;
 use subscriber::FutureServiceExt as SubscriberExt;
-use tarpc::{client, server};
-use tarpc::client::future::ClientExt;
+use tarpc::future::{client, server};
+use tarpc::future::client::ClientExt;
 use tarpc::util::{FirstSocketAddr, Message, Never};
 use tokio_core::reactor;
 
@@ -61,7 +61,7 @@ impl Subscriber {
     fn listen(id: u32,
               handle: &reactor::Handle,
               options: server::Options)
-              -> server::future::Handle {
+              -> server::Handle {
         let (server_handle, server) = Subscriber { id: id }
             .listen("localhost:0".first_socket_addr(), handle, options)
             .unwrap();

examples/readme_errors.rs

@@ -17,8 +17,8 @@ use std::error::Error;
 use std::fmt;
 use std::sync::mpsc;
 use std::thread;
-use tarpc::{client, server};
-use tarpc::client::sync::ClientExt;
+use tarpc::sync::{client, server};
+use tarpc::sync::client::ClientExt;
 
 service! {
     rpc hello(name: String) -> String | NoNameGiven;

examples/readme_futures.rs

@@ -12,8 +12,8 @@ extern crate tarpc;
 extern crate tokio_core;
 
 use futures::Future;
-use tarpc::{client, server};
-use tarpc::client::future::ClientExt;
+use tarpc::future::{client, server};
+use tarpc::future::client::ClientExt;
 use tarpc::util::{FirstSocketAddr, Never};
 use tokio_core::reactor;
 

examples/readme_sync.rs

@@ -14,8 +14,8 @@ extern crate tokio_core;
 
 use std::sync::mpsc;
 use std::thread;
-use tarpc::{client, server};
-use tarpc::client::sync::ClientExt;
+use tarpc::sync::{client, server};
+use tarpc::sync::client::ClientExt;
 use tarpc::util::Never;
 
 service! {

examples/server_calling_server.rs

@@ -15,8 +15,8 @@ extern crate tokio_core;
 use add::{FutureService as AddFutureService, FutureServiceExt as AddExt};
 use double::{FutureService as DoubleFutureService, FutureServiceExt as DoubleExt};
 use futures::{BoxFuture, Future, Stream};
-use tarpc::{client, server};
-use tarpc::client::future::ClientExt as Fc;
+use tarpc::future::{client, server};
+use tarpc::future::client::ClientExt as Fc;
 use tarpc::util::{FirstSocketAddr, Message, Never};
 use tokio_core::reactor;
 

examples/sync_server_calling_server.rs

@@ -16,8 +16,8 @@ use add::{SyncService as AddSyncService, SyncServiceExt as AddExt};
 use double::{SyncService as DoubleSyncService, SyncServiceExt as DoubleExt};
 use std::sync::mpsc;
 use std::thread;
-use tarpc::{client, server};
-use tarpc::client::sync::ClientExt as Fc;
+use tarpc::sync::{client, server};
+use tarpc::sync::client::ClientExt as Fc;
 use tarpc::util::{FirstSocketAddr, Message, Never};
 
 pub mod add {
@@ -69,7 +69,8 @@ fn main() {
     let (tx, rx) = mpsc::channel();
     thread::spawn(move || {
         let handle = AddServer.listen("localhost:0".first_socket_addr(),
-                         server::Options::default()).unwrap();
+                    server::Options::default())
+            .unwrap();
         tx.send(handle.addr()).unwrap();
         handle.run();
     });
@@ -80,7 +81,8 @@ fn main() {
     thread::spawn(move || {
         let add_client = add::SyncClient::connect(add, client::Options::default()).unwrap();
         let handle = DoubleServer::new(add_client)
-            .listen("localhost:0".first_socket_addr(), server::Options::default())
+            .listen("localhost:0".first_socket_addr(),
+                    server::Options::default())
             .unwrap();
         tx.send(handle.addr()).unwrap();
         handle.run();