fixed issues & indentations

Author: slanesuke

lightning/src/ln/msgs.rs

@@ -46,6 +46,7 @@ use core::fmt::Debug;
 use core::ops::Deref;
 #[cfg(feature = "std")]
 use core::str::FromStr;
+#[cfg(feature = "std")]
 use std::net::SocketAddr;
 use crate::io::{self, Cursor, Read};
 use crate::io_extras::read_to_end;
@@ -976,8 +977,7 @@ impl std::net::ToSocketAddrs for SocketAddress {
 				Ok(vec![socket_addr].into_iter())
 			}
 			SocketAddress::Hostname { ref hostname, port } => {
-				let socket_addr: Vec<SocketAddr> = (hostname.as_str(), *port).to_socket_addrs()?.collect();
-				Ok(socket_addr.into_iter())
+				(hostname.as_str(), *port).to_socket_addrs()
 			}
 			SocketAddress::OnionV2(..) => {
 				Err(std::io::Error::new(std::io::ErrorKind::Other, "Resolution of these \
@@ -4143,22 +4143,17 @@ mod tests {
 	#[cfg(feature = "std")]
 	fn test_socket_address_to_socket_addrs() {
 		assert_eq!(SocketAddress::TcpIpV4 {addr:[0u8; 4], port: 1337,}.to_socket_addrs().unwrap().next().unwrap(),
-				   SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::new(0,0,0,0),
-											   1337)));
+				   SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::new(0,0,0,0), 1337)));
 		assert_eq!(SocketAddress::TcpIpV6 {addr:[0u8; 16], port: 1337,}.to_socket_addrs().unwrap().next().unwrap(),
-				   SocketAddr::V6(SocketAddrV6::new(Ipv6Addr::from([0u8; 16]),
-											   1337, 0, 0)));
-		assert_eq!(SocketAddress::Hostname { hostname: Hostname::try_from("0.0.0.0".to_string()).unwrap(), port: 0
-					}.to_socket_addrs().unwrap().next().unwrap(),
-				   SocketAddr::V4(SocketAddrV4::new(
-					   Ipv4Addr::from([0u8; 4]),0)));
+				   SocketAddr::V6(SocketAddrV6::new(Ipv6Addr::from([0u8; 16]), 1337, 0, 0)));
+		assert_eq!(SocketAddress::Hostname { hostname: Hostname::try_from("0.0.0.0".to_string()).unwrap(), port: 0 }
+					   .to_socket_addrs().unwrap().next().unwrap(), SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::from([0u8; 4]),0)));
 		assert!(SocketAddress::OnionV2([0u8; 12]).to_socket_addrs().is_err());
-		assert!(SocketAddress::OnionV3{
-			ed25519_pubkey: [37, 24, 75, 5, 25, 73, 117, 194, 139, 102, 182, 107, 4, 105, 247, 246, 85,
-				111, 177, 172, 49, 137, 167, 155, 64, 221, 163, 47, 31, 33, 71, 3],
+		assert!(SocketAddress::OnionV3{ ed25519_pubkey: [37, 24, 75, 5, 25, 73, 117, 194, 139, 102,
+			182, 107, 4, 105, 247, 246, 85, 111, 177, 172, 49, 137, 167, 155, 64, 221, 163, 47, 31,
+			33, 71, 3],
 			checksum: 48326,
 			version: 121,
-			port: 1234
-		}.to_socket_addrs().is_err());
+			port: 1234 }.to_socket_addrs().is_err());
 	}
 }