From 4a3864d5cdbe90ba115df7c62fa68c91a671cff6 Mon Sep 17 00:00:00 2001 From: Josh Guilfoyle Date: Thu, 13 Jul 2023 21:16:03 -0700 Subject: [PATCH] cargo fmt and fix a minor merge error added superfluous docs --- src/socket.rs | 10 ++++++++-- src/sys/unix.rs | 2 -- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/socket.rs b/src/socket.rs index 80f278c2..73b806ba 100644 --- a/src/socket.rs +++ b/src/socket.rs @@ -1110,7 +1110,10 @@ impl Socket { /// /// [`set_header_included`]: Socket::set_header_included #[cfg(all(feature = "all", not(any(target_os = "redox", target_os = "espidf"))))] - #[cfg_attr(docsrs, doc(cfg(all(feature = "all", not(any(target_os = "redox", target_os = "espidf"))))))] + #[cfg_attr( + docsrs, + doc(cfg(all(feature = "all", not(any(target_os = "redox", target_os = "espidf"))))) + )] pub fn header_included(&self) -> io::Result { unsafe { getsockopt::(self.as_raw(), sys::IPPROTO_IP, sys::IP_HDRINCL) @@ -1134,7 +1137,10 @@ impl Socket { allow(rustdoc::broken_intra_doc_links) )] #[cfg(all(feature = "all", not(any(target_os = "redox", target_os = "espidf"))))] - #[cfg_attr(docsrs, doc(cfg(all(feature = "all", not(any(target_os = "redox", target_os = "espidf"))))))] + #[cfg_attr( + docsrs, + doc(cfg(all(feature = "all", not(any(target_os = "redox", target_os = "espidf"))))) + )] pub fn set_header_included(&self, included: bool) -> io::Result<()> { unsafe { setsockopt( diff --git a/src/sys/unix.rs b/src/sys/unix.rs index bd27c25c..aa06c1a3 100644 --- a/src/sys/unix.rs +++ b/src/sys/unix.rs @@ -117,8 +117,6 @@ pub(crate) use libc::MSG_TRUNC; pub(crate) use libc::SO_OOBINLINE; #[cfg(target_os = "espidf")] pub(crate) const MSG_TRUNC: libc::c_int = 4; // TODO: Expose in libc for ESP-IDF/LwIP - // Used in `Socket`. - // Used in `Socket`. // Used in `Socket`. #[cfg(not(target_os = "nto"))] pub(crate) use libc::ipv6_mreq as Ipv6Mreq;