diff options
| author | Dario Nieuwenhuis <[email protected]> | 2021-06-04 01:39:42 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-06-04 01:39:42 +0200 |
| commit | cd44b221ed558689a20090771228c703e56e3371 (patch) | |
| tree | a989bd77bcbb0d2471c66a44bc3242b2d975e97f /embassy-net | |
| parent | ebd3be74253dc72b35072475f6f9c2c1830f318e (diff) | |
| parent | 7d869bdec8290d44bc3815488011681332517f1e (diff) | |
Merge pull request #221 from embassy-rs/heapless
Update Heapless to 0.7 (const generics)
Diffstat (limited to 'embassy-net')
| -rw-r--r-- | embassy-net/Cargo.toml | 2 | ||||
| -rw-r--r-- | embassy-net/src/config/mod.rs | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/embassy-net/Cargo.toml b/embassy-net/Cargo.toml index 30970c371..5d391698c 100644 --- a/embassy-net/Cargo.toml +++ b/embassy-net/Cargo.toml | |||
| @@ -25,7 +25,7 @@ log = { version = "0.4.11", optional = true } | |||
| 25 | embassy = { version = "0.1.0", path = "../embassy" } | 25 | embassy = { version = "0.1.0", path = "../embassy" } |
| 26 | 26 | ||
| 27 | managed = { version = "0.8.0", default-features = false, features = [ "map" ]} | 27 | managed = { version = "0.8.0", default-features = false, features = [ "map" ]} |
| 28 | heapless = { version = "0.5.6", default-features = false } | 28 | heapless = { version = "0.7.1", default-features = false } |
| 29 | as-slice = { version = "0.1.4" } | 29 | as-slice = { version = "0.1.4" } |
| 30 | generic-array = { version = "0.14.4", default-features = false } | 30 | generic-array = { version = "0.14.4", default-features = false } |
| 31 | stable_deref_trait = { version = "1.2.0", default-features = false } | 31 | stable_deref_trait = { version = "1.2.0", default-features = false } |
diff --git a/embassy-net/src/config/mod.rs b/embassy-net/src/config/mod.rs index 16470f7e6..94725dba6 100644 --- a/embassy-net/src/config/mod.rs +++ b/embassy-net/src/config/mod.rs | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | use heapless::consts::*; | ||
| 2 | use heapless::Vec; | 1 | use heapless::Vec; |
| 3 | use smoltcp::time::Instant; | 2 | use smoltcp::time::Instant; |
| 4 | use smoltcp::wire::{Ipv4Address, Ipv4Cidr}; | 3 | use smoltcp::wire::{Ipv4Address, Ipv4Cidr}; |
| @@ -29,7 +28,7 @@ pub enum Event { | |||
| 29 | pub struct Config { | 28 | pub struct Config { |
| 30 | pub address: Ipv4Cidr, | 29 | pub address: Ipv4Cidr, |
| 31 | pub gateway: Option<Ipv4Address>, | 30 | pub gateway: Option<Ipv4Address>, |
| 32 | pub dns_servers: Vec<Ipv4Address, U3>, | 31 | pub dns_servers: Vec<Ipv4Address, 3>, |
| 33 | } | 32 | } |
| 34 | 33 | ||
| 35 | pub trait Configurator { | 34 | pub trait Configurator { |
