From 81ac54b20d10bb4f4e2f37e767e400e58c3fdf85 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Sun, 2 Jul 2023 21:04:48 -0700 Subject: [PATCH] Resolve redundant_closure_call clippy lint error: try not to call a closure in the expression where it is declared --> serde/src/de/impls.rs:1590:76 | 1590 | <(_, u16)>::deserialize(deserializer).map(|(ip, port)| $new(ip, port)) | ^^^^^^^^^^^^^^ ... 1620 | / parse_socket_impl!("IPv6 socket address" net::SocketAddrV6, |ip, port| net::SocketAddrV6::new( 1621 | | ip, port, 0, 0 1622 | | )); | |__- in this macro invocation | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#redundant_closure_call = note: `-D clippy::redundant-closure-call` implied by `-D clippy::all` = note: this error originates in the macro `parse_socket_impl` (in Nightly builds, run with -Z macro-backtrace for more info) --- serde/src/de/impls.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/serde/src/de/impls.rs b/serde/src/de/impls.rs index 54a919a5a..1c484da20 100644 --- a/serde/src/de/impls.rs +++ b/serde/src/de/impls.rs @@ -1587,7 +1587,7 @@ macro_rules! parse_socket_impl { if deserializer.is_human_readable() { deserializer.deserialize_str(FromStrVisitor::new($expecting)) } else { - <(_, u16)>::deserialize(deserializer).map(|(ip, port)| $new(ip, port)) + <(_, u16)>::deserialize(deserializer).map($new) } } } @@ -1614,12 +1614,10 @@ impl<'de> Deserialize<'de> for net::SocketAddr { } #[cfg(feature = "std")] -parse_socket_impl!("IPv4 socket address" net::SocketAddrV4, net::SocketAddrV4::new); +parse_socket_impl!("IPv4 socket address" net::SocketAddrV4, |(ip, port)| net::SocketAddrV4::new(ip, port)); #[cfg(feature = "std")] -parse_socket_impl!("IPv6 socket address" net::SocketAddrV6, |ip, port| net::SocketAddrV6::new( - ip, port, 0, 0 -)); +parse_socket_impl!("IPv6 socket address" net::SocketAddrV6, |(ip, port)| net::SocketAddrV6::new(ip, port, 0, 0)); ////////////////////////////////////////////////////////////////////////////////