From 51502537b12a76512b63bf87bf0f0fe97c3beedc Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Mon, 4 Mar 2019 14:45:23 -0800
Subject: [PATCH] Remove extra reference

---
 core/src/.contact_info.rs.swo | Bin 20480 -> 0 bytes
 fullnode/src/main.rs          |   2 +-
 netutil/src/lib.rs            |  10 +++++-----
 3 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 core/src/.contact_info.rs.swo

diff --git a/core/src/.contact_info.rs.swo b/core/src/.contact_info.rs.swo
deleted file mode 100644
index 19e59a7dad3a19b6c68ce13b0c54f3fac5ae0cda..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20480
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
S-Jx1mM3s@r5@i!kt^Wn&V;1rN

diff --git a/fullnode/src/main.rs b/fullnode/src/main.rs
index de59cfc096..ad5ead6486 100644
--- a/fullnode/src/main.rs
+++ b/fullnode/src/main.rs
@@ -212,7 +212,7 @@ fn main() {
 
     let gossip_addr = {
         let mut addr = solana_netutil::parse_port_or_addr(
-            &matches.value_of("gossip_port"),
+            matches.value_of("gossip_port"),
             FULLNODE_PORT_RANGE.0 + 1,
         );
         if matches.is_present("public_address") {
diff --git a/netutil/src/lib.rs b/netutil/src/lib.rs
index 2364cf8781..9205e2d315 100644
--- a/netutil/src/lib.rs
+++ b/netutil/src/lib.rs
@@ -30,7 +30,7 @@ pub fn get_public_ip_addr() -> Result<IpAddr, String> {
     }
 }
 
-pub fn parse_port_or_addr(optstr: &Option<&str>, default_port: u16) -> SocketAddr {
+pub fn parse_port_or_addr(optstr: Option<&str>, default_port: u16) -> SocketAddr {
     let daddr = SocketAddr::from(([0, 0, 0, 0], default_port));
 
     if let Some(addrstr) = optstr {
@@ -293,13 +293,13 @@ mod tests {
 
     #[test]
     fn test_parse_port_or_addr() {
-        let p1 = parse_port_or_addr(&Some("9000"), 1);
+        let p1 = parse_port_or_addr(Some("9000"), 1);
         assert_eq!(p1.port(), 9000);
-        let p2 = parse_port_or_addr(&Some("127.0.0.1:7000"), 1);
+        let p2 = parse_port_or_addr(Some("127.0.0.1:7000"), 1);
         assert_eq!(p2.port(), 7000);
-        let p2 = parse_port_or_addr(&Some("hi there"), 1);
+        let p2 = parse_port_or_addr(Some("hi there"), 1);
         assert_eq!(p2.port(), 1);
-        let p3 = parse_port_or_addr(&None, 1);
+        let p3 = parse_port_or_addr(None, 1);
         assert_eq!(p3.port(), 1);
     }