Avoid Panic

kanishkarj · Mar 27, 2019 · 720aedc · 720aedc
1 parent bac4dd4
commit 720aedc
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/tokio-trace-futures/examples/proxy_server.rs b/tokio-trace-futures/examples/proxy_server.rs
@@ -39,7 +39,7 @@ fn main() -> Result<(), Box<std::error::Error>> {
         .map_err(|e| debug!(msg = "error accepting socket", error = field::display(e)))
         .for_each(move |client| {
             let server = TcpStream::connect(&server_addr);
-            let mut client_addr: Option<SocketAddr> = None;
+            let mut client_addr = None;
             match client.peer_addr() {
                 Ok(x) => {
                     client_addr = Some(x);
@@ -99,7 +99,7 @@ fn main() -> Result<(), Box<std::error::Error>> {
                 })
                 .instrument(span!(
                     "transfer completed",
-                    client_address = field::debug(&client_addr.unwrap()),
+                    client_address = field::debug(&client_addr),
                     server_address = field::debug(&server_addr)
                 ));