diff --git a/Cargo.lock b/Cargo.lock index 094ab30..c5cf539 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -217,16 +217,6 @@ dependencies = [ "embedded-io", ] -[[package]] -name = "embedded-nal" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a943fad5ed3d3f8a00f1e80f6bba371f1e7f0df28ec38477535eb318dc19cc" -dependencies = [ - "nb", - "no-std-net", -] - [[package]] name = "embedded-tls" version = "0.17.0" @@ -403,18 +393,6 @@ version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" -[[package]] -name = "nb" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d5439c4ad607c3c23abf66de8c8bf57ba8adcd1f129e699851a6e43935d339d" - -[[package]] -name = "no-std-net" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65" - [[package]] name = "num_enum" version = "0.7.2" @@ -514,7 +492,6 @@ dependencies = [ "bitflags", "dns-protocol", "embedded-io", - "embedded-nal", "embedded-tls", "lazy_static", "psp", diff --git a/Cargo.toml b/Cargo.toml index a82767e..4973928 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,5 +24,4 @@ regex = { version = "1.10", default-features = false } lazy_static = { version = "1.5.0", default-features = false, features = [ "spin_no_std", ] } -embedded-nal = "0.8.0" bitflags = { version = "2.6.0", default-features = false } diff --git a/src/dns.rs b/src/dns.rs index 13a7f70..8b11690 100644 --- a/src/dns.rs +++ b/src/dns.rs @@ -5,9 +5,9 @@ use alloc::{ string::{String, ToString}, vec as a_vec, }; +use core::net::{IpAddr, Ipv4Addr, SocketAddr}; use dns_protocol::{Flags, Question, ResourceRecord}; use embedded_io::{Read, Write}; -use embedded_nal::{IpAddr, Ipv4Addr, SocketAddr}; use psp::sys::in_addr; use crate::socket::state::Connected; diff --git a/src/socket/mod.rs b/src/socket/mod.rs index 66723a3..e093bf5 100644 --- a/src/socket/mod.rs +++ b/src/socket/mod.rs @@ -6,7 +6,7 @@ #![allow(clippy::module_name_repetitions)] -use embedded_nal::{Ipv4Addr, SocketAddrV4}; +use core::net::{Ipv4Addr, SocketAddrV4}; use psp::sys::{in_addr, sockaddr}; use super::netc; @@ -78,4 +78,4 @@ impl ToSocketAddr for sockaddr { } // re-exports -pub type SocketAddr = embedded_nal::SocketAddr; +pub type SocketAddr = core::net::SocketAddr; diff --git a/src/socket/tcp.rs b/src/socket/tcp.rs index 022a809..868ef7e 100644 --- a/src/socket/tcp.rs +++ b/src/socket/tcp.rs @@ -3,7 +3,7 @@ use alloc::vec::Vec; use embedded_io::{ErrorType, Read, Write}; -use embedded_nal::SocketAddr; +use core::net::SocketAddr; use psp::sys; use core::ffi::c_void; diff --git a/src/socket/udp.rs b/src/socket/udp.rs index 73f9c51..155746b 100644 --- a/src/socket/udp.rs +++ b/src/socket/udp.rs @@ -1,8 +1,8 @@ #![allow(clippy::module_name_repetitions)] use alloc::vec::Vec; +use core::net::{IpAddr, Ipv4Addr, SocketAddr}; use embedded_io::{ErrorType, Read, Write}; -use embedded_nal::{IpAddr, Ipv4Addr, SocketAddr}; use psp::sys::{self, sockaddr, socklen_t}; use core::ffi::c_void; diff --git a/src/traits/dns.rs b/src/traits/dns.rs index 3b2e004..cf44b17 100644 --- a/src/traits/dns.rs +++ b/src/traits/dns.rs @@ -4,7 +4,7 @@ use core::fmt::Debug; use alloc::string::String; -use embedded_nal::SocketAddr; +use core::net::SocketAddr; use psp::sys::in_addr; /// Trait for resolving hostnames