socket: cleanup some cfg's

src/iface/interface.rs

@@ -867,10 +867,7 @@ where
                 Socket::Raw(ref mut socket) => {
                     socket.dispatch(cx, |response| respond!(IpPacket::Raw(response)))
                 }
-                #[cfg(all(
-                    feature = "socket-icmp",
-                    any(feature = "proto-ipv4", feature = "proto-ipv6")
-                ))]
+                #[cfg(feature = "socket-icmp")]
                 Socket::Icmp(ref mut socket) => socket.dispatch(cx, |response| match response {
                     #[cfg(feature = "proto-ipv4")]
                     (IpRepr::Ipv4(ipv4_repr), IcmpRepr::Ipv4(icmpv4_repr)) => {
@@ -1325,10 +1322,7 @@ impl<'a> InterfaceInner<'a> {
         }
     }
 
-    #[cfg(all(
-        any(feature = "proto-ipv4", feature = "proto-ipv6"),
-        feature = "socket-raw"
-    ))]
+    #[cfg(feature = "socket-raw")]
     fn raw_socket_filter<'frame>(
         &mut self,
         cx: &Context,

src/lib.rs

@@ -111,9 +111,10 @@ compile_error!("You must enable at least one of the following features: proto-ip
         feature = "socket-udp",
         feature = "socket-tcp",
         feature = "socket-icmp",
+        feature = "socket-dhcp",
     ))
 ))]
-compile_error!("If you enable the socket feature, you must enable at least one of the following features: socket-raw, socket-udp, socket-tcp, socket-icmp");
+compile_error!("If you enable the socket feature, you must enable at least one of the following features: socket-raw, socket-udp, socket-tcp, socket-icmp, socket-dhcp");
 
 #[cfg(all(
     feature = "socket",

src/socket/mod.rs

@@ -14,17 +14,15 @@ size for a buffer, allocate it, and let the networking stack use it.
 use crate::phy::DeviceCapabilities;
 use crate::time::Instant;
 
+mod meta;
+mod set;
+
 #[cfg(feature = "socket-dhcpv4")]
 mod dhcpv4;
-#[cfg(all(
-    feature = "socket-icmp",
-    any(feature = "proto-ipv4", feature = "proto-ipv6")
-))]
+#[cfg(feature = "socket-icmp")]
 mod icmp;
-mod meta;
 #[cfg(feature = "socket-raw")]
 mod raw;
-mod set;
 #[cfg(feature = "socket-tcp")]
 mod tcp;
 #[cfg(feature = "socket-udp")]
@@ -34,29 +32,22 @@ mod udp;
 mod waker;
 
 pub(crate) use self::meta::Meta as SocketMeta;
-#[cfg(feature = "async")]
-pub(crate) use self::waker::WakerRegistration;
+pub use self::set::{Handle as SocketHandle, Item as SocketSetItem, Set as SocketSet};
+pub use self::set::{Iter as SocketSetIter, IterMut as SocketSetIterMut};
 
+#[cfg(feature = "socket-dhcpv4")]
+pub use self::dhcpv4::{Config as Dhcpv4Config, Dhcpv4Socket, Event as Dhcpv4Event};
+#[cfg(feature = "socket-icmp")]
+pub use self::icmp::{Endpoint as IcmpEndpoint, IcmpPacketMetadata, IcmpSocket, IcmpSocketBuffer};
 #[cfg(feature = "socket-raw")]
 pub use self::raw::{RawPacketMetadata, RawSocket, RawSocketBuffer};
-
-#[cfg(all(
-    feature = "socket-icmp",
-    any(feature = "proto-ipv4", feature = "proto-ipv6")
-))]
-pub use self::icmp::{Endpoint as IcmpEndpoint, IcmpPacketMetadata, IcmpSocket, IcmpSocketBuffer};
-
-#[cfg(feature = "socket-udp")]
-pub use self::udp::{UdpPacketMetadata, UdpSocket, UdpSocketBuffer};
-
 #[cfg(feature = "socket-tcp")]
 pub use self::tcp::{SocketBuffer as TcpSocketBuffer, State as TcpState, TcpSocket};
+#[cfg(feature = "socket-udp")]
+pub use self::udp::{UdpPacketMetadata, UdpSocket, UdpSocketBuffer};
 
-#[cfg(feature = "socket-dhcpv4")]
-pub use self::dhcpv4::{Config as Dhcpv4Config, Dhcpv4Socket, Event as Dhcpv4Event};
-
-pub use self::set::{Handle as SocketHandle, Item as SocketSetItem, Set as SocketSet};
-pub use self::set::{Iter as SocketSetIter, IterMut as SocketSetIterMut};
+#[cfg(feature = "async")]
+pub(crate) use self::waker::WakerRegistration;
 
 /// Gives an indication on the next time the socket should be polled.
 #[derive(Debug, PartialOrd, Ord, PartialEq, Eq, Clone, Copy)]
@@ -84,10 +75,7 @@ pub(crate) enum PollAt {
 pub enum Socket<'a> {
     #[cfg(feature = "socket-raw")]
     Raw(RawSocket<'a>),
-    #[cfg(all(
-        feature = "socket-icmp",
-        any(feature = "proto-ipv4", feature = "proto-ipv6")
-    ))]
+    #[cfg(feature = "socket-icmp")]
     Icmp(IcmpSocket<'a>),
     #[cfg(feature = "socket-udp")]
     Udp(UdpSocket<'a>),
@@ -108,7 +96,7 @@ macro_rules! dispatch_socket {
         match $self_ {
             #[cfg(feature = "socket-raw")]
             &$( $mut_ )* Socket::Raw(ref $( $mut_ )* $socket) => $code,
-            #[cfg(all(feature = "socket-icmp", any(feature = "proto-ipv4", feature = "proto-ipv6")))]
+            #[cfg(feature = "socket-icmp")]
             &$( $mut_ )* Socket::Icmp(ref $( $mut_ )* $socket) => $code,
             #[cfg(feature = "socket-udp")]
             &$( $mut_ )* Socket::Udp(ref $( $mut_ )* $socket) => $code,
@@ -161,10 +149,7 @@ macro_rules! from_socket {
 
 #[cfg(feature = "socket-raw")]
 from_socket!(RawSocket<'a>, Raw);
-#[cfg(all(
-    feature = "socket-icmp",
-    any(feature = "proto-ipv4", feature = "proto-ipv6")
-))]
+#[cfg(feature = "socket-icmp")]
 from_socket!(IcmpSocket<'a>, Icmp);
 #[cfg(feature = "socket-udp")]
 from_socket!(UdpSocket<'a>, Udp);