Build with stable

vi · Jan 3, 2020 · d9cadb2 · d9cadb2
1 parent a936216
commit d9cadb2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/client.rs b/src/client.rs
@@ -112,6 +112,7 @@ impl CommunicationActorState {
             },
             CommunicationActorMessage::ClientData(buf) => {
                 use rand::Rng;
+
                 let mut rng = rand::thread_rng();
 
                 // Try sending though a random port
@@ -147,7 +148,7 @@ pub async fn client(
     name: String,
     pco: PlayloadCommunicationOptions,
     cs: ClientSettings,
-) -> Result<!> {
+) -> Result<()> {
     let sendaddr = pco.sendto;
     let bindaddr = if let Some(x) = pco.bind {
         x

diff --git a/src/main.rs b/src/main.rs
@@ -95,7 +95,7 @@ struct ServerMetrics {
     snderr: u64,
 }
 
-async fn server(sa: SocketAddr) -> Result<!> {
+async fn server(sa: SocketAddr) -> Result<()> {
     use ttl_cache::TtlCache;
 
     type Registry = TtlCache<String, TtlCache<SocketAddr, ()>>;
@@ -235,7 +235,7 @@ async fn main() -> Result<()> {
         if opt.cs.keepalive_interval != 30 {
             eprintln!("--keepalive-interval is meaningless in server mode");
         }
-        server(sa).await?
+        server(sa).await?;
     } else {
         if opt.name.is_none() {
             Err("--name is required in client mode")?;
@@ -246,6 +246,7 @@ async fn main() -> Result<()> {
         let name = opt.name.unwrap();
         let sa = opt.client.unwrap();
 
-        client::client(sa, name, opt.pco, opt.cs).await?
+        client::client(sa, name, opt.pco, opt.cs).await?;
     }
+    Ok(())
 }