From d06a04f807d86d5ec28d31e2522b4b922de1f01c Mon Sep 17 00:00:00 2001
From: Richard Whitehouse <github@richardwhiuk.com>
Date: Mon, 22 Oct 2018 16:56:20 -0400
Subject: [PATCH] Rename Sip to Transport

---
 src/lib.rs                      |  2 +-
 src/{server.rs => transport.rs} | 33 ++++++++++++++-------------------
 2 files changed, 15 insertions(+), 20 deletions(-)
 rename src/{server.rs => transport.rs} (91%)

diff --git a/src/lib.rs b/src/lib.rs
index 1446ef7..b3275a3 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -14,5 +14,5 @@ extern crate nom;
 mod codec;
 mod message;
 mod parser;
-pub mod server;
+pub mod transport;
 mod types;
diff --git a/src/server.rs b/src/transport.rs
similarity index 91%
rename from src/server.rs
rename to src/transport.rs
index b84b180..804a352 100644
--- a/src/server.rs
+++ b/src/transport.rs
@@ -10,21 +10,21 @@ use tokio_io::codec::Decoder;
 use codec::SipCodec;
 use message::Message;
 
-pub struct Sip {
+pub struct Transport {
     listeners: Vec<TcpListener>,
     handle: Handle,
 }
 
-impl Sip {
-    pub fn new(handle : Handle) -> Sip {
-        Sip {
+impl Transport {
+    pub fn new(handle: Handle) -> Transport {
+        Transport {
             listeners: Vec::new(),
             handle: handle,
         }
     }
 
-    pub fn listen_tcp(handle: Handle, addr: &str) -> Result<Sip, Box<Error>> {
-        let mut s = Sip::new(handle);
+    pub fn listen_tcp(handle: Handle, addr: &str) -> Result<Transport, Box<Error>> {
+        let mut s = Transport::new(handle);
         s.add_tcp_listen_address(addr)?;
         Ok(s)
     }
@@ -40,10 +40,7 @@ impl Sip {
         self.listeners.push(listener);
     }
 
-    pub fn run<F>(
-        self,
-        caller: Arc<Box<F>>,
-    ) -> Box<Future<Item = (), Error = std::io::Error>>
+    pub fn run<F>(self, caller: Arc<Box<F>>) -> Box<Future<Item = (), Error = std::io::Error>>
     where
         F: 'static + Fn(Message) -> Result<(), std::io::Error>,
     {
@@ -85,7 +82,7 @@ mod tests {
 
     extern crate env_logger;
 
-    use super::Sip;
+    use super::Transport;
     use futures;
     use futures::future::Either;
     use futures::Future;
@@ -110,17 +107,15 @@ mod tests {
         // when it arrives.
         let m = Arc::new(Mutex::new(Option::None));
 
-        let sip = Sip::listen_tcp(core.handle(), addr).unwrap();
+        let sip = Transport::listen_tcp(core.handle(), addr).unwrap();
         let server = {
             let m = m.clone();
 
-            sip.run(
-                Arc::new(Box::new(move |message| {
-                    let mut m = m.lock().unwrap();
-                    *m = Some(message);
-                    Ok(())
-                })),
-            )
+            sip.run(Arc::new(Box::new(move |message| {
+                let mut m = m.lock().unwrap();
+                *m = Some(message);
+                Ok(())
+            })))
         };
 
         // Send the request
-- 
2.34.1