#14: Migrated to embedded-nal v0.9

Cargo.toml

@@ -12,15 +12,15 @@ readme = "README.md"
 documentation = "https://docs.rs/embedded-redis"
 
 [dependencies]
-embedded-nal = "0.8.0"
+embedded-nal = "0.9.0"
 embedded-time = "0.12.1"
 nb = "1.1.0"
 redis-protocol = { version = "6.0.0", default-features = false, features = ["bytes", "resp2", "resp3", "libm", "hashbrown", "alloc"] }
 bytes = { version = "1.9.0", default-features = false }
 mockall = { version = "0.12.1", optional=true }
 
 [dev-dependencies]
-std-embedded-nal = { package = "mm-std-embedded-nal", version = "0.3.0" }
+std-embedded-nal = { package = "mm-std-embedded-nal", version = "0.4.0" }
 std-embedded-time = "0.1.0"
 mockall = { version = "0.12.1" }
 

src/commands/auth.rs

@@ -8,7 +8,7 @@
 //! ```
 //!# use core::str::FromStr;
 //!# use std::str::Bytes;
-//!# use embedded_nal::SocketAddr;
+//!# use core::net::SocketAddr;
 //!# use std_embedded_nal::Stack;
 //!# use std_embedded_time::StandardClock;
 //!# use embedded_redis::commands::auth::AuthCommand;
@@ -32,7 +32,7 @@
 //! *Requires Redis version > 6.0 + serverside ACL configuration*
 //! ```
 //!# use core::str::FromStr;
-//!# use embedded_nal::SocketAddr;
+//!# use core::net::SocketAddr;
 //!# use std_embedded_nal::Stack;
 //!# use std_embedded_time::StandardClock;
 //!# use embedded_redis::commands::auth::AuthCommand;
@@ -59,7 +59,7 @@
 //! to [CommandErrors::ErrorResponse](crate::network::CommandErrors::ErrorResponse).
 //! ```
 //!# use core::str::FromStr;
-//!# use embedded_nal::SocketAddr;
+//!# use core::net::SocketAddr;
 //!# use std_embedded_nal::Stack;
 //!# use std_embedded_time::StandardClock;
 //!# use embedded_redis::commands::auth::AuthCommand;

src/commands/bgsave.rs

@@ -6,7 +6,7 @@
 //! By default no `SCHEDULE` option is used.
 //! ```
 //!# use core::str::FromStr;
-//!# use embedded_nal::SocketAddr;
+//!# use core::net::SocketAddr;
 //!# use std_embedded_nal::Stack;
 //!# use std_embedded_time::StandardClock;
 //!# use embedded_redis::commands::bgsave::BackgroundSaveCommand;
@@ -25,7 +25,7 @@
 //! Using `SCHEDULE` option by setting constructor flag to `true`.
 //! ```
 //!# use core::str::FromStr;
-//!# use embedded_nal::SocketAddr;
+//!# use core::net::SocketAddr;
 //!# use std_embedded_nal::Stack;
 //!# use std_embedded_time::StandardClock;
 //!# use embedded_redis::commands::bgsave::BackgroundSaveCommand;
@@ -43,7 +43,7 @@
 //! [Client](Client#method.get) provides a shorthand method for this command.
 //! ```no_run
 //!# use core::str::FromStr;
-//!# use embedded_nal::SocketAddr;
+//!# use core::net::SocketAddr;
 //!# use std_embedded_nal::Stack;
 //!# use std_embedded_time::StandardClock;
 //!# use embedded_redis::network::ConnectionHandler;

src/commands/custom.rs

@@ -13,7 +13,7 @@
 //! The following Example demonstrates execution of [ECHO](<https://redis.io/commands/echo/>) command
 //! ```
 //!# use core::str::FromStr;
-//!# use embedded_nal::SocketAddr;
+//!# use core::net::SocketAddr;
 //!# use std_embedded_nal::Stack;
 //!# use std_embedded_time::StandardClock;
 //!# use embedded_redis::commands::builder::CommandBuilder;

src/commands/get.rs

@@ -6,7 +6,7 @@
 //! In case of existing key [`Some(GetResponse)`](GetResponse) is returned.
 //! ```
 //!# use core::str::FromStr;
-//!# use embedded_nal::SocketAddr;
+//!# use core::net::SocketAddr;
 //!# use std_embedded_nal::Stack;
 //!# use std_embedded_time::StandardClock;
 //!# use embedded_redis::commands::get::GetCommand;
@@ -29,7 +29,7 @@
 //! In case of missing key `None` is returned
 //! ```
 //!# use core::str::FromStr;
-//!# use embedded_nal::SocketAddr;
+//!# use core::net::SocketAddr;
 //!# use std_embedded_nal::Stack;
 //!# use std_embedded_time::StandardClock;
 //!# use embedded_redis::commands::get::GetCommand;
@@ -51,7 +51,7 @@
 //! ```
 //!# use core::str::FromStr;
 //!# use bytes::Bytes;
-//!# use embedded_nal::SocketAddr;
+//!# use core::net::SocketAddr;
 //!# use std_embedded_nal::Stack;
 //!# use std_embedded_time::StandardClock;
 //!# use embedded_redis::commands::get::GetCommand;
@@ -78,7 +78,7 @@
 //! [Client](Client#method.get) provides a shorthand method for this command.
 //! ```
 //!# use core::str::FromStr;
-//!# use embedded_nal::SocketAddr;
+//!# use core::net::SocketAddr;
 //!# use std_embedded_nal::Stack;
 //!# use std_embedded_time::StandardClock;
 //!# use embedded_redis::commands::set::SetCommand;

src/commands/hello.rs

@@ -11,7 +11,7 @@
 //! Response is mapped to [HelloResponse].
 //! ```
 //!# use core::str::FromStr;
-//!# use embedded_nal::SocketAddr;
+//!# use core::net::SocketAddr;
 //!# use std_embedded_nal::Stack;
 //!# use std_embedded_time::StandardClock;
 //!# use embedded_redis::commands::hello::HelloCommand;

src/commands/hget.rs

@@ -5,7 +5,7 @@
 //! # Using command object
 //! ```
 //!# use core::str::FromStr;
-//!# use embedded_nal::SocketAddr;
+//!# use core::net::SocketAddr;
 //!# use std_embedded_nal::Stack;
 //!# use std_embedded_time::StandardClock;
 //!# use embedded_redis::commands::builder::CommandBuilder;
@@ -29,7 +29,7 @@
 //! In case key or field is missing. [None] is returned.
 //! ```
 //!# use core::str::FromStr;
-//!# use embedded_nal::SocketAddr;
+//!# use core::net::SocketAddr;
 //!# use std_embedded_nal::Stack;
 //!# use std_embedded_time::StandardClock;
 //!# use embedded_redis::commands::builder::CommandBuilder;
@@ -53,7 +53,7 @@
 //! ```
 //!# use core::str::FromStr;
 //!# use bytes::Bytes;
-//!# use embedded_nal::SocketAddr;
+//!# use core::net::SocketAddr;
 //!# use std_embedded_nal::Stack;
 //!# use std_embedded_time::StandardClock;
 //!# use embedded_redis::commands::hset::HashSetCommand;

src/commands/hgetall.rs

@@ -5,7 +5,7 @@
 //! # Using command object
 //! ```
 //!# use core::str::FromStr;
-//!# use embedded_nal::SocketAddr;
+//!# use core::net::SocketAddr;
 //!# use std_embedded_nal::Stack;
 //!# use std_embedded_time::StandardClock;
 //!# use embedded_redis::commands::builder::CommandBuilder;
@@ -31,7 +31,7 @@
 //! In case key or field is missing. [None] is returned.
 //! ```
 //!# use core::str::FromStr;
-//!# use embedded_nal::SocketAddr;
+//!# use core::net::SocketAddr;
 //!# use std_embedded_nal::Stack;
 //!# use std_embedded_time::StandardClock;
 //!# use embedded_redis::commands::builder::CommandBuilder;
@@ -55,7 +55,7 @@
 //! ```
 //!# use core::str::FromStr;
 //!# use bytes::Bytes;
-//!# use embedded_nal::SocketAddr;
+//!# use core::net::SocketAddr;
 //!# use std_embedded_nal::Stack;
 //!# use std_embedded_time::StandardClock;
 //!# use embedded_redis::commands::hset::HashSetCommand;

src/commands/hset.rs

@@ -5,7 +5,7 @@
 //! # Using command object
 //! ```
 //!# use core::str::FromStr;
-//!# use embedded_nal::SocketAddr;
+//!# use core::net::SocketAddr;
 //!# use std_embedded_nal::Stack;
 //!# use std_embedded_time::StandardClock;
 //!# use embedded_redis::commands::builder::CommandBuilder;
@@ -28,7 +28,7 @@
 //! # Setting multiple fields at once
 //! ```
 //!# use core::str::FromStr;
-//!# use embedded_nal::SocketAddr;
+//!# use core::net::SocketAddr;
 //!# use std_embedded_nal::Stack;
 //!# use std_embedded_time::StandardClock;
 //!# use embedded_redis::commands::builder::CommandBuilder;
@@ -56,7 +56,7 @@
 //! ```
 //!# use core::str::FromStr;
 //!# use bytes::Bytes;
-//!# use embedded_nal::SocketAddr;
+//!# use core::net::SocketAddr;
 //!# use std_embedded_nal::Stack;
 //!# use std_embedded_time::StandardClock;
 //!# use embedded_redis::network::ConnectionHandler;

src/commands/ping.rs

@@ -6,7 +6,7 @@
 //! Internally it is checked whether the server answers with PONG. If not, an error is returned.
 //! ```
 //!# use core::str::FromStr;
-//!# use embedded_nal::SocketAddr;
+//!# use core::net::SocketAddr;
 //!# use std_embedded_nal::Stack;
 //!# use std_embedded_time::StandardClock;
 //!# use embedded_redis::network::ConnectionHandler;
@@ -23,7 +23,7 @@
 //! Sending a `PingCommand` as alternative to client shorthand.
 //! ```
 //!# use core::str::FromStr;
-//!# use embedded_nal::SocketAddr;
+//!# use core::net::SocketAddr;
 //!# use std_embedded_nal::Stack;
 //!# use std_embedded_time::StandardClock;
 //!# use embedded_redis::commands::ping::PingCommand;
@@ -44,7 +44,7 @@
 //! The abstraction compares the server's response with the argument and returns an error if there is no match.
 //! ```
 //!# use core::str::FromStr;
-//!# use embedded_nal::SocketAddr;
+//!# use core::net::SocketAddr;
 //!# use std_embedded_nal::Stack;
 //!# use std_embedded_time::StandardClock;
 //!# use embedded_redis::commands::ping::PingCommand;

src/commands/publish.rs

@@ -5,7 +5,7 @@
 //! # Using command object
 //! ```
 //!# use core::str::FromStr;
-//!# use embedded_nal::SocketAddr;
+//!# use core::net::SocketAddr;
 //!# use std_embedded_nal::Stack;
 //!# use std_embedded_time::StandardClock;
 //!# use embedded_redis::commands::publish::PublishCommand;
@@ -27,7 +27,7 @@
 //! [Client](Client#method.publish) provides a shorthand method.
 //! ```
 //!# use core::str::FromStr;
-//!# use embedded_nal::SocketAddr;
+//!# use core::net::SocketAddr;
 //!# use std_embedded_nal::Stack;
 //!# use std_embedded_time::StandardClock;
 //!# use embedded_redis::network::ConnectionHandler;

src/commands/set.rs

@@ -5,7 +5,7 @@
 //! # Basic usage
 //! ```
 //!# use core::str::FromStr;
-//!# use embedded_nal::SocketAddr;
+//!# use core::net::SocketAddr;
 //!# use std_embedded_nal::Stack;
 //!# use std_embedded_time::StandardClock;
 //!# use embedded_redis::commands::set::SetCommand;
@@ -25,7 +25,7 @@
 //! Setting TTL can be achieved in the following way. Fore more details s. [ExpirationPolicy] enum.
 //! ```
 //!# use core::str::FromStr;
-//!# use embedded_nal::SocketAddr;
+//!# use core::net::SocketAddr;
 //!# use std_embedded_nal::Stack;
 //!# use std_embedded_time::StandardClock;
 //!# use embedded_redis::commands::set::{SetCommand, ExpirationPolicy};
@@ -48,7 +48,7 @@
 //! Using this options affects the return type. s. [ExclusiveSetResponse]
 //! ```
 //!# use core::str::FromStr;
-//!# use embedded_nal::SocketAddr;
+//!# use core::net::SocketAddr;
 //!# use std_embedded_nal::Stack;
 //!# use std_embedded_time::StandardClock;
 //!# use embedded_redis::commands::set::{SetCommand, Exclusivity};
@@ -71,7 +71,7 @@
 //! Using this options affects the return type. s. [ReturnPreviousResponse]
 //! ```
 //!# use core::str::FromStr;
-//!# use embedded_nal::SocketAddr;
+//!# use core::net::SocketAddr;
 //!# use std_embedded_nal::Stack;
 //!# use std_embedded_time::StandardClock;
 //!# use embedded_redis::commands::set::{SetCommand};
@@ -93,7 +93,7 @@
 //! ```
 //!# use core::str::FromStr;
 //!# use bytes::Bytes;
-//!# use embedded_nal::SocketAddr;
+//!# use core::net::SocketAddr;
 //!# use std_embedded_nal::Stack;
 //!# use std_embedded_time::StandardClock;
 //!# use embedded_redis::commands::set::SetCommand;

src/lib.rs

@@ -8,7 +8,7 @@
 //!
 //! ```
 //!# use core::str::FromStr;
-//!# use embedded_nal::SocketAddr;
+//!# use core::net::SocketAddr;
 //!# use std_embedded_nal::Stack;
 //!# use std_embedded_time::StandardClock;
 //!# use embedded_redis::network::ConnectionHandler;
@@ -62,7 +62,7 @@ pub mod commands;
 /// * A clock implementing [embedded-time](<https://docs.rs/embedded-time/latest/embedded_time/>). Optional if no Timeout is configured.
 /// ```
 ///# use core::str::FromStr;
-///# use embedded_nal::SocketAddr;
+///# use core::net::SocketAddr;
 ///# use std_embedded_nal::Stack;
 ///# use std_embedded_time::StandardClock;
 ///# use embedded_redis::network::ConnectionHandler;
@@ -86,7 +86,7 @@ pub mod commands;
 /// Authentication is done in the following way:
 /// ```
 ///# use core::str::FromStr;
-///# use embedded_nal::SocketAddr;
+///# use core::net::SocketAddr;
 ///# use std_embedded_nal::Stack;
 ///# use std_embedded_time::StandardClock;
 ///# use embedded_redis::network::{ConnectionHandler, Credentials};
@@ -113,7 +113,7 @@ pub mod commands;
 ///
 /// ```
 ///# use core::str::FromStr;
-///# use embedded_nal::SocketAddr;
+///# use core::net::SocketAddr;
 ///# use std_embedded_nal::Stack;
 ///# use std_embedded_time::StandardClock;
 ///# use embedded_redis::network::{ConnectionHandler, Credentials};
@@ -136,7 +136,7 @@ pub mod commands;
 ///
 /// ```
 ///# use core::str::FromStr;
-///# use embedded_nal::SocketAddr;
+///# use core::net::SocketAddr;
 ///# use std_embedded_nal::Stack;
 ///# use std_embedded_time::StandardClock;
 ///# use embedded_redis::network::{ConnectionHandler, Credentials};
@@ -162,7 +162,7 @@ pub mod commands;
 ///
 /// ````
 ///# use core::str::FromStr;
-///# use embedded_nal::SocketAddr;
+///# use core::net::SocketAddr;
 ///# use std_embedded_nal::Stack;
 ///# use std_embedded_time::StandardClock;
 ///# use embedded_redis::commands::set::SetCommand;
@@ -195,7 +195,7 @@ pub mod commands;
 /// simultaneously* and handle responses in any order at any point in time:
 /// ```
 ///# use core::str::FromStr;
-///# use embedded_nal::SocketAddr;
+///# use core::net::SocketAddr;
 ///# use std_embedded_nal::Stack;
 ///# use std_embedded_time::StandardClock;
 ///# use embedded_redis::commands::set::SetCommand;
@@ -220,7 +220,7 @@ pub mod commands;
 /// If `ready()` returns true, then next call to `wait()` is not expected to block.
 /// ```
 ///# use core::str::FromStr;
-///# use embedded_nal::SocketAddr;
+///# use core::net::SocketAddr;
 ///# use std_embedded_nal::Stack;
 ///# use std_embedded_time::StandardClock;
 ///# use embedded_redis::commands::set::SetCommand;
@@ -257,7 +257,7 @@ pub mod commands;
 ///
 /// ````
 ///# use core::str::FromStr;
-///# use embedded_nal::SocketAddr;
+///# use core::net::SocketAddr;
 ///# use std_embedded_nal::Stack;
 ///# use std_embedded_time::StandardClock;
 ///# use embedded_redis::commands::set::SetCommand;

src/network/handler.rs

@@ -10,7 +10,8 @@ use crate::network::protocol::{Protocol, Resp2, Resp3};
 use crate::network::response::MemoryParameters;
 use alloc::string::{String, ToString};
 use core::cell::RefCell;
-use embedded_nal::{SocketAddr, TcpClientStack};
+use core::net::SocketAddr;
+use embedded_nal::TcpClientStack;
 use embedded_time::duration::Extensions;
 use embedded_time::duration::Microseconds;
 use embedded_time::Clock;

src/network/tests/benchmarks.rs

@@ -1,7 +1,7 @@
 use crate::network::ConnectionHandler;
 use bytes::Bytes;
+use core::net::SocketAddr;
 use core::str::FromStr;
-use embedded_nal::SocketAddr;
 use std_embedded_nal::Stack;
 use std_embedded_time::StandardClock;
 use test::Bencher;