Merge pull request #81 from newAM/ip_in_core

Add support for ip_in_core

Author: ryan-summers

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 * Add blanket impls of all the traits for mutable references.
 - Bump dependency version of `no-std-net` to `v0.6`.
 - Bump MSRV to 1.53.0 due to `no-std-net`'s use of or-patterns.
+- Added support for `core::net` with the `ip_in_core` feature.
 
 ## [0.6.0] - 2021-05-25
 

Cargo.toml

@@ -17,7 +17,11 @@ readme = "README.md"
 keywords = ["network"]
 categories = ["embedded", "hardware-support", "no-std", "network-programming"]
 
+[features]
+default = ["no-std-net"]
+ip_in_core = []
+
 [dependencies]
 nb = "1"
-no-std-net = "0.6"
+no-std-net = { version = "0.6", optional = true }
 heapless = "^0.7"

embedded-nal-async/Cargo.toml

@@ -11,6 +11,9 @@ readme = "README.md"
 keywords = ["network"]
 categories = ["embedded", "hardware-support", "no-std", "network-programming", "asynchronous"]
 
+[features]
+ip_in_core = []
+
 [dependencies]
 no-std-net = "0.6"
 heapless = "^0.7"

embedded-nal-async/src/dns.rs

@@ -1,6 +1,6 @@
+use crate::IpAddr;
 use embedded_nal::AddrType;
 use heapless::String;
-use no_std_net::IpAddr;
 
 /// This trait is an extension trait for [`TcpStack`] and [`UdpStack`] for dns
 /// resolutions. It does not handle every DNS record type, but is meant as an

embedded-nal-async/src/lib.rs

@@ -5,12 +5,17 @@
 #![allow(incomplete_features)]
 #![deny(missing_docs)]
 #![deny(unsafe_code)]
+#![cfg_attr(feature = "ip_in_core", feature(ip_in_core))]
 
 mod dns;
 mod stack;
 // Needed by embedded-nal trait implementers who build get_host_by_address results, or by trait
 // users who pass the results on.
 pub use heapless;
+
+#[cfg(feature = "ip_in_core")]
+pub use core::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6};
+#[cfg(not(feature = "ip_in_core"))]
 pub use no_std_net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6};
 
 pub use dns::Dns;

embedded-nal-async/src/stack/tcp.rs

@@ -1,4 +1,4 @@
-use no_std_net::SocketAddr;
+use crate::SocketAddr;
 
 /// This trait is implemented by TCP/IP stacks. The trait allows the underlying driver to
 /// construct multiple connections that implement the I/O traits from embedded-io.

embedded-nal-async/src/stack/udp.rs

@@ -14,7 +14,7 @@
 //!   Implementing `UniquelyBound` and `MultiplyBound` with the same type is expected to be a
 //!   common choice.
 
-use no_std_net::SocketAddr;
+use crate::SocketAddr;
 
 /// This trait is implemented by UDP sockets.
 ///
@@ -140,7 +140,7 @@ pub trait UdpStack {
 		&self,
 		remote: SocketAddr,
 	) -> Result<(SocketAddr, Self::Connected), Self::Error> {
-		use no_std_net::{Ipv4Addr, Ipv6Addr, SocketAddr::*, SocketAddrV4, SocketAddrV6};
+		use crate::{Ipv4Addr, Ipv6Addr, SocketAddr::*, SocketAddrV4, SocketAddrV6};
 
 		let local = match remote {
 			V4(_) => V4(SocketAddrV4::new(Ipv4Addr::UNSPECIFIED, 0)),

src/dns.rs

@@ -1,5 +1,5 @@
+use crate::IpAddr;
 use heapless::String;
-use no_std_net::IpAddr;
 
 /// This is the host address type to be returned by `gethostbyname`.
 ///

src/lib.rs

@@ -2,6 +2,7 @@
 #![no_std]
 #![deny(missing_docs)]
 #![deny(unsafe_code)]
+#![cfg_attr(feature = "ip_in_core", feature(ip_in_core))]
 
 mod dns;
 mod stack;
@@ -10,6 +11,13 @@ pub use nb;
 // Needed by embedded-nal trait implementers who build get_host_by_address results, or by trait
 // users who pass the results on.
 pub use heapless;
+
+#[cfg(not(any(feature = "ip_in_core", feature = "no-std-net")))]
+compile_error!("You must select the ip_in_core feature or the no-std-net feature");
+
+#[cfg(feature = "ip_in_core")]
+pub use core::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6};
+#[cfg(not(feature = "ip_in_core"))]
 pub use no_std_net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6};
 
 pub use dns::{AddrType, Dns};

src/stack/tcp.rs

@@ -1,4 +1,4 @@
-use no_std_net::SocketAddr;
+use crate::SocketAddr;
 
 /// This trait is implemented by TCP/IP stacks. You could, for example, have an implementation
 /// which knows how to send AT commands to an ESP8266 WiFi module. You could have another implementation