diff --git a/core/src/.contact_info.rs.swo b/core/src/.contact_info.rs.swo deleted file mode 100644 index 19e59a7dad..0000000000 Binary files a/core/src/.contact_info.rs.swo and /dev/null differ 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 { } } -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); }