From 0d1be7400bad1d6e5a8b9f2298136b9cd7872153 Mon Sep 17 00:00:00 2001
From: Tim Kuehn <timothy.j.kuehn@gmail.com>
Date: Mon, 25 Jan 2016 22:31:13 -0800
Subject: [PATCH] Make type param single char

---
 tarpc/src/protocol.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tarpc/src/protocol.rs b/tarpc/src/protocol.rs
index 3a0002f..4859d76 100644
--- a/tarpc/src/protocol.rs
+++ b/tarpc/src/protocol.rs
@@ -97,23 +97,23 @@ impl InflightRpcs {
 
 }
 
-struct ConnectionHandler<'a, Server> where Server: Serve {
+struct ConnectionHandler<'a, S> where S: Serve {
     read_stream: TcpStream,
     write_stream: Mutex<TcpStream>,
     shutdown: &'a AtomicBool,
     inflight_rpcs: &'a InflightRpcs,
     timeout: Option<Duration>,
-    server: Server,
+    server: S,
 }
 
-impl<'a, Server> Drop for ConnectionHandler<'a, Server> where Server: Serve {
+impl<'a, S> Drop for ConnectionHandler<'a, S> where S: Serve {
     fn drop(&mut self) {
         trace!("ConnectionHandler: finished serving client.");
         self.inflight_rpcs.decrement_and_notify();
     }
 }
 
-impl<'a, Server> ConnectionHandler<'a, Server> where Server: Serve {
+impl<'a, S> ConnectionHandler<'a, S> where S: Serve {
     fn read<Request>(read_stream: &mut TcpStream,
                      timeout: Option<Duration>)
                      -> bincode::serde::DeserializeResult<Packet<Request>>
@@ -225,9 +225,9 @@ impl ServeHandle {
 }
 
 /// Start
-pub fn serve_async<A, Server>(addr: A, server: Server, read_timeout: Option<Duration>) -> io::Result<ServeHandle>
+pub fn serve_async<A, S>(addr: A, server: S, read_timeout: Option<Duration>) -> io::Result<ServeHandle>
     where A: ToSocketAddrs,
-          Server: 'static + Serve
+          S: 'static + Serve
 {
     let listener = try!(TcpListener::bind(&addr));
     let addr = try!(listener.local_addr());