diff options
| author | Dario Nieuwenhuis <[email protected]> | 2023-11-08 22:59:58 +0100 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2023-11-10 16:43:53 +0100 |
| commit | 4647df14b16c95ef56bf2e6cc4303583be3b4846 (patch) | |
| tree | 69c591be4841ab1c8fd5046bee0d399133c4577c /embassy-net | |
| parent | b3367be9c8f0eb54d500dc2e6f652ade05859088 (diff) | |
Update heapless to v0.8, embedded-nal-async to v0.7
Diffstat (limited to 'embassy-net')
| -rw-r--r-- | embassy-net/Cargo.toml | 6 | ||||
| -rw-r--r-- | embassy-net/src/dns.rs | 3 | ||||
| -rw-r--r-- | embassy-net/src/tcp.rs | 5 |
3 files changed, 6 insertions, 8 deletions
diff --git a/embassy-net/Cargo.toml b/embassy-net/Cargo.toml index 918c5bd33..0b029bd3c 100644 --- a/embassy-net/Cargo.toml +++ b/embassy-net/Cargo.toml | |||
| @@ -46,7 +46,7 @@ igmp = ["smoltcp/proto-igmp"] | |||
| 46 | defmt = { version = "0.3", optional = true } | 46 | defmt = { version = "0.3", optional = true } |
| 47 | log = { version = "0.4.14", optional = true } | 47 | log = { version = "0.4.14", optional = true } |
| 48 | 48 | ||
| 49 | smoltcp = { version = "0.10.0", default-features = false, features = [ | 49 | smoltcp = { git = "https://github.com/smoltcp-rs/smoltcp", rev = "9b791ae3057e10f7afcb70c67deb5daf714293a9", default-features = false, features = [ |
| 50 | "socket", | 50 | "socket", |
| 51 | "async", | 51 | "async", |
| 52 | ] } | 52 | ] } |
| @@ -57,10 +57,10 @@ embassy-sync = { version = "0.4.0", path = "../embassy-sync" } | |||
| 57 | embedded-io-async = { version = "0.6.0", optional = true } | 57 | embedded-io-async = { version = "0.6.0", optional = true } |
| 58 | 58 | ||
| 59 | managed = { version = "0.8.0", default-features = false, features = [ "map" ] } | 59 | managed = { version = "0.8.0", default-features = false, features = [ "map" ] } |
| 60 | heapless = { version = "0.7.5", default-features = false } | 60 | heapless = { version = "0.8", default-features = false } |
| 61 | as-slice = "0.2.1" | 61 | as-slice = "0.2.1" |
| 62 | generic-array = { version = "0.14.4", default-features = false } | 62 | generic-array = { version = "0.14.4", default-features = false } |
| 63 | stable_deref_trait = { version = "1.2.0", default-features = false } | 63 | stable_deref_trait = { version = "1.2.0", default-features = false } |
| 64 | futures = { version = "0.3.17", default-features = false, features = [ "async-await" ] } | 64 | futures = { version = "0.3.17", default-features = false, features = [ "async-await" ] } |
| 65 | atomic-pool = "1.0" | 65 | atomic-pool = "1.0" |
| 66 | embedded-nal-async = { version = "0.6.0", optional = true } | 66 | embedded-nal-async = { version = "0.7", optional = true } |
diff --git a/embassy-net/src/dns.rs b/embassy-net/src/dns.rs index fdd45b314..6b804f9ed 100644 --- a/embassy-net/src/dns.rs +++ b/embassy-net/src/dns.rs | |||
| @@ -101,7 +101,8 @@ where | |||
| 101 | async fn get_host_by_address( | 101 | async fn get_host_by_address( |
| 102 | &self, | 102 | &self, |
| 103 | _addr: embedded_nal_async::IpAddr, | 103 | _addr: embedded_nal_async::IpAddr, |
| 104 | ) -> Result<heapless::String<256>, Self::Error> { | 104 | _result: &mut [u8], |
| 105 | ) -> Result<usize, Self::Error> { | ||
| 105 | todo!() | 106 | todo!() |
| 106 | } | 107 | } |
| 107 | } | 108 | } |
diff --git a/embassy-net/src/tcp.rs b/embassy-net/src/tcp.rs index bcd5bb618..90fd08e94 100644 --- a/embassy-net/src/tcp.rs +++ b/embassy-net/src/tcp.rs | |||
| @@ -618,10 +618,7 @@ pub mod client { | |||
| 618 | async fn connect<'a>( | 618 | async fn connect<'a>( |
| 619 | &'a self, | 619 | &'a self, |
| 620 | remote: embedded_nal_async::SocketAddr, | 620 | remote: embedded_nal_async::SocketAddr, |
| 621 | ) -> Result<Self::Connection<'a>, Self::Error> | 621 | ) -> Result<Self::Connection<'a>, Self::Error> { |
| 622 | where | ||
| 623 | Self: 'a, | ||
| 624 | { | ||
| 625 | let addr: crate::IpAddress = match remote.ip() { | 622 | let addr: crate::IpAddress = match remote.ip() { |
| 626 | #[cfg(feature = "proto-ipv4")] | 623 | #[cfg(feature = "proto-ipv4")] |
| 627 | IpAddr::V4(addr) => crate::IpAddress::Ipv4(crate::Ipv4Address::from_bytes(&addr.octets())), | 624 | IpAddr::V4(addr) => crate::IpAddress::Ipv4(crate::Ipv4Address::from_bytes(&addr.octets())), |
