NaxdyOrg/embassy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #392 from embassy-rs/update-deps

Browse source 
Update lots of deps
This commit is contained in:
Dario Nieuwenhuis 2021-09-11 01:43:43 +02:00 committed by GitHub
commit 200f881048
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 145 additions and 148 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1,4 +1,5 @@
target
target_ci
Cargo.lock
third_party
/Cargo.toml

3
.vscode/settings.json vendored
View file

@ -6,12 +6,11 @@
"rust-analyzer.checkOnSave.allTargets": false,
"rust-analyzer.cargo.noDefaultFeatures": true,
"rust-analyzer.checkOnSave.noDefaultFeatures": true,
"rust-analyzer.cargo.target": "thumbv7em-none-eabi",
//"rust-analyzer.cargo.target": "thumbv7em-none-eabi",
"rust-analyzer.cargo.features": [
// These are needed to prevent embassy-net from failing to build
"embassy-net/medium-ethernet",
"embassy-net/tcp",
"embassy-net/pool-16",
],
"rust-analyzer.procMacro.enable": true,
"rust-analyzer.cargo.runBuildScripts": true,

8
embassy-hal-common/Cargo.toml
View file

@ -14,8 +14,8 @@ defmt-error = [ ]
[dependencies]
embassy = { version = "0.1.0", path = "../embassy" }
defmt = { version = "0.2.0", optional = true }
log = { version = "0.4.11", optional = true }
cortex-m = "0.7.1"
usb-device = "0.2.7"
defmt = { version = "0.2.3", optional = true }
log = { version = "0.4.14", optional = true }
cortex-m = "0.7.3"
usb-device = "0.2.8"
num-traits = { version = "0.2.14", default-features = false }

8
embassy-macros/Cargo.toml
View file

@ -5,10 +5,10 @@ authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>"]
edition = "2018"
[dependencies]
syn = { version = "1.0.39", features = ["full", "extra-traits"] }
quote = "1.0.7"
darling = "0.10.2"
proc-macro2 = "1.0.24"
syn = { version = "1.0.76", features = ["full", "extra-traits"] }
quote = "1.0.9"
darling = "0.13.0"
proc-macro2 = "1.0.29"
[lib]
proc-macro = true

12
embassy-net/Cargo.toml
View file

@ -25,18 +25,18 @@ pool-32 = []
[dependencies]
defmt = { version = "0.2.0", optional = true }
log = { version = "0.4.11", optional = true }
defmt = { version = "0.2.3", optional = true }
log = { version = "0.4.14", optional = true }
embassy = { version = "0.1.0", path = "../embassy" }
managed = { version = "0.8.0", default-features = false, features = [ "map" ] }
heapless = { version = "0.7.1", default-features = false }
as-slice = { version = "0.1.4" }
heapless = { version = "0.7.5", default-features = false }
as-slice = "0.2.1"
generic-array = { version = "0.14.4", default-features = false }
stable_deref_trait = { version = "1.2.0", default-features = false }
futures = { version = "0.3.5", default-features = false, features = [ "async-await" ]}
atomic-pool = "0.2.0"
futures = { version = "0.3.17", default-features = false, features = [ "async-await" ] }
atomic-pool = "0.2.1"
[dependencies.smoltcp]
git = "https://github.com/smoltcp-rs/smoltcp"

12
embassy-nrf/Cargo.toml
View file

@ -38,13 +38,13 @@ embassy = { version = "0.1.0", path = "../embassy" }
embassy-macros = { version = "0.1.0", path = "../embassy-macros", features = ["nrf"]}
embassy-hal-common = {version = "0.1.0", path = "../embassy-hal-common" }
defmt = { version = "0.2.0", optional = true }
log = { version = "0.4.11", optional = true }
defmt = { version = "0.2.3", optional = true }
log = { version = "0.4.14", optional = true }
cortex-m-rt = ">=0.6.15,<0.8"
cortex-m = "0.7.1"
embedded-hal = { version = "0.2.4" }
embedded-dma = { version = "0.1.2" }
futures = { version = "0.3.5", default-features = false }
cortex-m = "0.7.3"
embedded-hal = "0.2.6"
embedded-dma = "0.1.2"
futures = { version = "0.3.17", default-features = false }
critical-section = "0.2.1"
rand_core = "0.6.3"

10
embassy-rp/Cargo.toml
View file

@ -22,13 +22,13 @@ defmt-error = [ ]
embassy = { version = "0.1.0", path = "../embassy", features = [ "time-tick-1mhz" ] }
embassy-hal-common = {version = "0.1.0", path = "../embassy-hal-common" }
embassy-macros = { version = "0.1.0", path = "../embassy-macros", features = ["rp"]}
atomic-polyfill = { version = "0.1.2" }
defmt = { version = "0.2.0", optional = true }
log = { version = "0.4.11", optional = true }
atomic-polyfill = "0.1.3"
defmt = { version = "0.2.3", optional = true }
log = { version = "0.4.14", optional = true }
cortex-m-rt = ">=0.6.15,<0.8"
cortex-m = "0.7.1"
cortex-m = "0.7.3"
critical-section = "0.2.1"
rp2040-pac2 = { git = "https://github.com/embassy-rs/rp2040-pac2", rev="9ad7223a48a065e612bc7dc7be5bf5bd0b41cfc4", features = ["rt"] }
#rp2040-pac2 = { path = "../../rp/rp2040-pac2", features = ["rt"] }
embedded-hal = { version = "0.2.4", features = [ "unproven" ] }
embedded-hal = { version = "0.2.6", features = [ "unproven" ] }

20
embassy-stm32/Cargo.toml
View file

@ -12,28 +12,28 @@ embassy-hal-common = {version = "0.1.0", path = "../embassy-hal-common" }
embassy-traits = {version = "0.1.0", path = "../embassy-traits" }
embassy-net = { version = "0.1.0", path = "../embassy-net", default-features = false, optional = true }
defmt = { version = "0.2.0", optional = true }
log = { version = "0.4.11", optional = true }
defmt = { version = "0.2.3", optional = true }
log = { version = "0.4.14", optional = true }
cortex-m-rt = ">=0.6.15,<0.8"
cortex-m = "0.7.1"
embedded-hal = { version = "0.2.4", features = ["unproven"] }
futures = { version = "0.3.5", default-features = false, features = ["async-await"] }
rand_core = { version = "0.6.2" }
sdio-host = { version = "0.5.0" }
cortex-m = "0.7.3"
embedded-hal = { version = "0.2.6", features = ["unproven"] }
futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
rand_core = "0.6.3"
sdio-host = "0.5.0"
embedded-sdmmc = { git = "https://github.com/thalesfragoso/embedded-sdmmc-rs", branch = "async", optional = true }
critical-section = "0.2.1"
bare-metal = "1.0.0"
atomic-polyfill = "0.1.3"
stm32-metapac = { version = "0.1.0", path = "../stm32-metapac", features = ["rt"] }
vcell = { version = "0.1.3", optional = true }
bxcan = { version = "0.5.1" }
bxcan = "0.5.1"
cfg-if = "1.0.0"
[build-dependencies]
stm32-metapac = { version = "0.1.0", path = "../stm32-metapac", default-features = false }
serde = { version = "1.0.123", features = [ "derive" ]}
serde_yaml = "0.8.15"
serde = { version = "1.0.130", features = [ "derive" ] }
serde_yaml = "0.8.21"
[features]
defmt-trace = [ ]

4
embassy-traits/Cargo.toml
View file

@ -8,5 +8,5 @@ edition = "2018"
std = []
[dependencies]
defmt = { version = "0.2.0", optional = true }
embedded-hal = { version = "0.2.3", features = ["unproven"] }
defmt = { version = "0.2.3", optional = true }
embedded-hal = { version = "0.2.6", features = ["unproven"] }

22
embassy/Cargo.toml
View file

@ -31,21 +31,21 @@ defmt-error = []
executor-agnostic = []
[dependencies]
defmt = { version = "0.2.0", optional = true }
log = { version = "0.4.11", optional = true }
defmt = { version = "0.2.3", optional = true }
log = { version = "0.4.14", optional = true }
cortex-m = "0.7.1"
futures = { version = "0.3.5", default-features = false, features = [ "cfg-target-has-atomic", "unstable" ] }
pin-project = { version = "1.0.2", default-features = false }
cortex-m = "0.7.3"
futures = { version = "0.3.17", default-features = false, features = [ "cfg-target-has-atomic", "unstable" ] }
pin-project = { version = "1.0.8", default-features = false }
embassy-macros = { version = "0.1.0", path = "../embassy-macros"}
embassy-traits = { version = "0.1.0", path = "../embassy-traits"}
atomic-polyfill = { version = "0.1.1" }
atomic-polyfill = "0.1.3"
critical-section = "0.2.1"
embedded-hal = "0.2.5"
embedded-hal = "0.2.6"
[dev-dependencies]
embassy = { path = ".", features = ["executor-agnostic"] }
futures-executor = { version = "0.3", features = [ "thread-pool" ] }
futures-test = "0.3"
futures-timer = "0.3"
futures-util = { version = "0.3", features = [ "channel" ] }
futures-executor = { version = "0.3.17", features = [ "thread-pool" ] }
futures-test = "0.3.17"
futures-timer = "3.0.2"
futures-util = { version = "0.3.17", features = [ "channel" ] }

2
embassy/src/util/mpsc.rs
View file

@ -868,7 +868,7 @@ mod tests {
let send_task_2 = executor.spawn_with_handle(async move { s1.send(3).await });
// Wish I could think of a means of determining that the async send is waiting instead.
// However, I've used the debugger to observe that the send does indeed wait.
assert!(Delay::new(Duration::from_millis(500)).await.is_ok());
Delay::new(Duration::from_millis(500)).await;
assert_eq!(r.recv().await, Some(1));
assert!(executor
.spawn(async move { while let Some(_) = r.recv().await {} })

8
examples/nrf/Cargo.toml
View file

@ -21,12 +21,12 @@ embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "def
embassy-traits = { version = "0.1.0", path = "../../embassy-traits", features = ["defmt"] }
embassy-nrf = { version = "0.1.0", path = "../../embassy-nrf", features = ["defmt", "defmt-trace", "nrf52840", "time-driver-rtc1", "gpiote"] }
defmt = "0.2.0"
defmt = "0.2.3"
defmt-rtt = "0.2.0"
cortex-m = { version = "0.7.1", features = ["inline-asm"] }
cortex-m = { version = "0.7.3", features = ["inline-asm"] }
cortex-m-rt = "0.7.0"
embedded-hal = { version = "0.2.4" }
embedded-hal = "0.2.6"
panic-probe = { version = "0.2.0", features = ["print-defmt"] }
futures = { version = "0.3.8", default-features = false, features = ["async-await"] }
futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
rand = { version = "0.8.4", default-features = false }

10
examples/rp/Cargo.toml
View file

@ -19,16 +19,16 @@ defmt-error = []
[dependencies]
embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-trace"] }
embassy-rp = { version = "0.1.0", path = "../../embassy-rp", features = ["defmt", "defmt-trace"] }
atomic-polyfill = { version = "0.1.1" }
atomic-polyfill = "0.1.3"
defmt = "0.2.0"
defmt = "0.2.3"
defmt-rtt = "0.2.0"
cortex-m = { version = "0.7.1", features = ["inline-asm"] }
cortex-m = { version = "0.7.3", features = ["inline-asm"] }
cortex-m-rt = "0.7.0"
embedded-hal = { version = "0.2.4" }
embedded-hal = "0.2.6"
panic-probe = { version = "0.2.0", features = ["print-defmt"] }
futures = { version = "0.3.8", default-features = false, features = ["async-await", "cfg-target-has-atomic", "unstable"] }
futures = { version = "0.3.17", default-features = false, features = ["async-await", "cfg-target-has-atomic", "unstable"] }
display-interface-spi = "0.4.1"
embedded-graphics = "0.7.1"
st7789 = "0.6.1"

18
examples/std/Cargo.toml
View file

@ -9,12 +9,12 @@ embassy = { version = "0.1.0", path = "../../embassy", features = ["log", "std",
embassy-net = { version = "0.1.0", path = "../../embassy-net", features=["std", "log", "medium-ethernet", "tcp", "dhcpv4"] }
smoltcp = { git = "https://github.com/smoltcp-rs/smoltcp", rev="e4241510337e095b9d21136c5f58b2eaa1b78479", default-features = false }
async-io = "1.3.1"
env_logger = "0.8.2"
futures = { version = "0.3.8", default-features = false, features = ["async-await"] }
log = "0.4.11"
nix = "0.21.0"
libc = "0.2.81"
clap = { version = "3.0.0-beta.2", features = ["derive"] }
rand_core = { version = "0.6.0", features = ["std"] }
heapless = { version = "0.7.1", default-features = false }
async-io = "1.6.0"
env_logger = "0.9.0"
futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
log = "0.4.14"
nix = "0.22.1"
libc = "0.2.101"
clap = { version = "3.0.0-beta.4", features = ["derive"] }
rand_core = { version = "0.6.3", features = ["std"] }
heapless = { version = "0.7.5", default-features = false }

9
examples/std/src/serial_port.rs
View file

@ -1,6 +1,6 @@
use nix::errno::Errno;
use nix::fcntl::OFlag;
use nix::sys::termios;
use nix::Error;
use std::io;
use std::os::unix::io::{AsRawFd, RawFd};
@ -63,9 +63,6 @@ impl io::Write for SerialPort {
}
}
fn to_io_error(e: Error) -> io::Error {
match e {
Error::Sys(errno) => errno.into(),
e => io::Error::new(io::ErrorKind::InvalidInput, e),
}
fn to_io_error(e: Errno) -> io::Error {
e.into()
}

8
examples/stm32f0/Cargo.toml
View file

@ -8,12 +8,12 @@ resolver = "2"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
cortex-m = { version = "0.7.1", features = ["inline-asm"] }
cortex-m = { version = "0.7.3", features = ["inline-asm"] }
cortex-m-rt = "0.7.0"
defmt = "0.2.0"
defmt = "0.2.3"
defmt-rtt = "0.2.0"
panic-probe = { version = "0.2.0" }
rtt-target = { version = "0.3", features = ["cortex-m"] }
panic-probe = "0.2.0"
rtt-target = { version = "0.3.1", features = ["cortex-m"] }
embassy = { path = "../../embassy", features = ["defmt"] }
embassy-stm32 = { path = "../../embassy-stm32", features = ["defmt", "stm32f030f4", "time-driver-tim3"] }

14
examples/stm32f4/Cargo.toml
View file

@ -22,14 +22,14 @@ embassy-traits = { version = "0.1.0", path = "../../embassy-traits", features =
embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "defmt-trace", "stm32f429zi", "unstable-pac", "memory-x", "time-driver-tim2"] }
embassy-hal-common = {version = "0.1.0", path = "../../embassy-hal-common" }
defmt = "0.2.0"
defmt = "0.2.3"
defmt-rtt = "0.2.0"
cortex-m = "0.7.1"
cortex-m = "0.7.3"
cortex-m-rt = "0.7.0"
embedded-hal = { version = "0.2.4" }
embedded-hal = "0.2.6"
panic-probe = { version = "0.2.0", features = ["print-defmt"] }
futures = { version = "0.3.8", default-features = false, features = ["async-await"] }
rtt-target = { version = "0.3", features = ["cortex-m"] }
heapless = { version = "0.7.1", default-features = false }
nb = { version = "1.0" }
futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
rtt-target = { version = "0.3.1", features = ["cortex-m"] }
heapless = { version = "0.7.5", default-features = false }
nb = "1.0.0"

12
examples/stm32g0/Cargo.toml
View file

@ -22,13 +22,13 @@ embassy-traits = { version = "0.1.0", path = "../../embassy-traits", features =
embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "defmt-trace", "time-driver-tim2", "stm32g071rb", "unstable-pac"] }
embassy-hal-common = {version = "0.1.0", path = "../../embassy-hal-common" }
defmt = "0.2.0"
defmt = "0.2.3"
defmt-rtt = "0.2.0"
cortex-m = "0.7.1"
cortex-m = "0.7.3"
cortex-m-rt = "0.7.0"
embedded-hal = { version = "0.2.4" }
embedded-hal = "0.2.6"
panic-probe = { version = "0.2.0", features = ["print-defmt"] }
futures = { version = "0.3.8", default-features = false, features = ["async-await"] }
rtt-target = { version = "0.3", features = ["cortex-m"] }
heapless = { version = "0.7.1", default-features = false }
futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
rtt-target = { version = "0.3.1", features = ["cortex-m"] }
heapless = { version = "0.7.5", default-features = false }

14
examples/stm32h7/Cargo.toml
View file

@ -24,17 +24,17 @@ embassy-hal-common = {version = "0.1.0", path = "../../embassy-hal-common" }
embassy-net = { path = "../../embassy-net", default-features = false, features = ["defmt-debug", "defmt", "tcp", "medium-ethernet", "pool-16"] }
embassy-macros = { path = "../../embassy-macros" }
defmt = "0.2.0"
defmt = "0.2.3"
defmt-rtt = "0.2.0"
cortex-m = "0.7.1"
cortex-m = "0.7.3"
cortex-m-rt = "0.7.0"
embedded-hal = { version = "0.2.4" }
embedded-hal = "0.2.6"
panic-probe = { version = "0.2.0", features = ["print-defmt"] }
futures = { version = "0.3.8", default-features = false, features = ["async-await"] }
rtt-target = { version = "0.3", features = ["cortex-m"] }
heapless = { version = "0.7.1", default-features = false }
rand_core = { version = "0.6.2" }
futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
rtt-target = { version = "0.3.1", features = ["cortex-m"] }
heapless = { version = "0.7.5", default-features = false }
rand_core = "0.6.3"
critical-section = "0.2.1"
micromath = "2.0.0"

12
examples/stm32l0/Cargo.toml
View file

@ -23,13 +23,13 @@ embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["
embassy-hal-common = {version = "0.1.0", path = "../../embassy-hal-common" }
embassy-macros = { path = "../../embassy-macros" }
defmt = "0.2.0"
defmt = "0.2.3"
defmt-rtt = "0.2.0"
cortex-m = "0.7.1"
cortex-m = "0.7.3"
cortex-m-rt = "0.7.0"
embedded-hal = { version = "0.2.4" }
embedded-hal = "0.2.6"
panic-probe = { version = "0.2.0", features = ["print-defmt"] }
futures = { version = "0.3.8", default-features = false, features = ["async-await"] }
rtt-target = { version = "0.3", features = ["cortex-m"] }
heapless = { version = "0.7.1", default-features = false }
futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
rtt-target = { version = "0.3.1", features = ["cortex-m"] }
heapless = { version = "0.7.5", default-features = false }

12
examples/stm32l4/Cargo.toml
View file

@ -22,16 +22,16 @@ embassy-traits = { version = "0.1.0", path = "../../embassy-traits", features =
embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "defmt-trace", "unstable-pac", "stm32l4s5vi", "time-driver-tim2"] }
embassy-hal-common = {version = "0.1.0", path = "../../embassy-hal-common" }
defmt = "0.2.0"
defmt = "0.2.3"
defmt-rtt = "0.2.0"
cortex-m = "0.7.1"
cortex-m = "0.7.3"
cortex-m-rt = "0.7.0"
embedded-hal = { version = "0.2.4" }
embedded-hal = "0.2.6"
panic-probe = { version = "0.2.0", features = ["print-defmt"] }
futures = { version = "0.3.8", default-features = false, features = ["async-await"] }
rtt-target = { version = "0.3", features = ["cortex-m"] }
heapless = { version = "0.7.1", default-features = false }
futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
rtt-target = { version = "0.3.1", features = ["cortex-m"] }
heapless = { version = "0.7.5", default-features = false }
micromath = "2.0.0"

12
examples/stm32wb55/Cargo.toml
View file

@ -22,13 +22,13 @@ embassy-traits = { version = "0.1.0", path = "../../embassy-traits", features =
embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "defmt-trace", "stm32wb55cc", "time-driver-tim2"] }
embassy-hal-common = {version = "0.1.0", path = "../../embassy-hal-common" }
defmt = "0.2.0"
defmt = "0.2.3"
defmt-rtt = "0.2.0"
cortex-m = "0.7.1"
cortex-m = "0.7.3"
cortex-m-rt = "0.7.0"
embedded-hal = { version = "0.2.4" }
embedded-hal = "0.2.6"
panic-probe = { version = "0.2.0", features = ["print-defmt"] }
futures = { version = "0.3.8", default-features = false, features = ["async-await"] }
rtt-target = { version = "0.3", features = ["cortex-m"] }
heapless = { version = "0.7.1", default-features = false }
futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
rtt-target = { version = "0.3.1", features = ["cortex-m"] }
heapless = { version = "0.7.5", default-features = false }

12
examples/stm32wl55/Cargo.toml
View file

@ -22,13 +22,13 @@ embassy-traits = { version = "0.1.0", path = "../../embassy-traits", features =
embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "defmt-trace", "stm32wl55jc_cm4", "time-driver-tim2", "memory-x", "subghz"] }
embassy-hal-common = {version = "0.1.0", path = "../../embassy-hal-common" }
defmt = "0.2.0"
defmt = "0.2.3"
defmt-rtt = "0.2.0"
cortex-m = "0.7.1"
cortex-m = "0.7.3"
cortex-m-rt = "0.7.0"
embedded-hal = { version = "0.2.4" }
embedded-hal = "0.2.6"
panic-probe = { version = "0.2.0", features = ["print-defmt"] }
futures = { version = "0.3.8", default-features = false, features = ["async-await"] }
rtt-target = { version = "0.3", features = ["cortex-m"] }
heapless = { version = "0.7.1", default-features = false }
futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
rtt-target = { version = "0.3.1", features = ["cortex-m"] }
heapless = { version = "0.7.5", default-features = false }

8
stm32-metapac-gen/Cargo.toml
View file

@ -5,8 +5,8 @@ edition = "2018"
[dependencies]
regex = "1.4.6"
regex = "1.5.4"
chiptool = { git = "https://github.com/embassy-rs/chiptool", rev = "31c3c09197d63d29eddbf4c70d6158edac0ac5d3" }
serde = { version = "1.0.123", features = [ "derive" ]}
serde_yaml = "0.8.15"
proc-macro2 = "1.0"
serde = { version = "1.0.130", features = [ "derive" ] }
serde_yaml = "0.8.21"
proc-macro2 = "1.0.29"

2
stm32-metapac/Cargo.toml
View file

@ -5,7 +5,7 @@ edition = "2018"
resolver = "2"
[dependencies]
cortex-m = "0.7.2"
cortex-m = "0.7.3"
cortex-m-rt = { version = ">=0.6.15,<0.8", optional = true }
# BEGIN BUILD DEPENDENCIES

6
xtask/Cargo.toml
View file

@ -8,7 +8,7 @@ name = "xtask"
version = "0.1.0"
[dependencies]
anyhow = "1.0"
xshell = "0.1"
yaml-rust = "0.4"
anyhow = "1.0.43"
xshell = "0.1.17"
yaml-rust = "0.4.5"
walkdir = "2.3.2"