Skip to content

Commit 5e7c177

Browse files
pperanichpperanich
committed
chore: bump maitake-sync. Revert whitespace changes in Cargo.toml
1 parent 1c0ae21 commit 5e7c177

9 files changed

Lines changed: 103 additions & 101 deletions

File tree

‎example/esp32c6-serial/.cargo/config.toml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
runner = "probe-rs run --chip=esp32c6 --preverify --always-print-stacktrace --no-location --catch-hardfault"
33

44
[env]
5-
DEFMT_LOG="info"
5+
DEFMT_LOG = "info"
66

77
[build]
88
rustflags = [
99
# Required to obtain backtraces (e.g. when using the "esp-backtrace" crate.)
1010
# NOTE: May negatively impact performance of produced code
11-
"-C", "force-frame-pointers",
11+
"-C",
12+
"force-frame-pointers",
1213
]
1314

1415
target = "riscv32imac-unknown-none-elf"

‎example/esp32c6-serial/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ embassy-executor = { version = "0.9", features = ["defmt"] }
1010
embassy-sync = { version = "0.7", features = ["defmt"] }
1111
embassy-time = "0.5"
1212
esp-hal = { version = "1.0.0-rc.0", features = [
13-
"defmt",
14-
"esp32c6",
15-
"unstable",
13+
"defmt",
14+
"esp32c6",
15+
"unstable",
1616
] }
1717
esp-bootloader-esp-idf = { version = "0.2", features = ["esp32c6"] }
1818
esp-hal-smartled = { git = "https://github.com/esp-rs/esp-hal-community", rev = "20badf1b03727153074fd647b5a3c2a26310ad3e" }

‎example/firmware/.cargo/config.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
runner = "probe-rs run --chip RP2040 --speed 12000 --protocol swd"
33

44
[build]
5-
target = "thumbv6m-none-eabi" # Cortex-M0 and Cortex-M0+
5+
target = "thumbv6m-none-eabi" # Cortex-M0 and Cortex-M0+
66

77
[env]
88
DEFMT_LOG = "debug"

‎example/firmware/Cargo.toml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@ edition = "2021"
66
[dependencies]
77
cortex-m = { version = "0.7.6", features = ["inline-asm"] }
88
embassy-executor = { version = "0.9", features = [
9-
"arch-cortex-m",
10-
"executor-thread",
11-
"executor-interrupt",
12-
"defmt",
9+
"arch-cortex-m",
10+
"executor-thread",
11+
"executor-interrupt",
12+
"defmt",
1313
] }
1414
embassy-rp = { version = "0.8.0", features = [
15-
"rp2040",
16-
"defmt",
17-
"unstable-pac",
18-
"time-driver",
19-
"critical-section-impl",
15+
"rp2040",
16+
"defmt",
17+
"unstable-pac",
18+
"time-driver",
19+
"critical-section-impl",
2020
] }
2121
embassy-sync = { version = "0.7", features = ["defmt"] }
2222
embassy-time = { version = "0.5", features = [
23-
"defmt",
24-
"defmt-timestamp-uptime",
23+
"defmt",
24+
"defmt-timestamp-uptime",
2525
] }
2626
embassy-usb = { version = "0.5.0", features = ["defmt"] }
2727
embedded-hal-bus = { version = "0.1", features = ["async"] }

‎example/nrf52840-serial/Cargo.toml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,32 @@ embedded-io-async = "0.6.1"
1111
static_cell = "2.1"
1212

1313
cortex-m = { version = "0.7.6", features = [
14-
"inline-asm",
15-
"critical-section-single-core",
14+
"inline-asm",
15+
"critical-section-single-core",
1616
] }
1717
embassy-executor = { version = "0.9", features = [
18-
"arch-cortex-m",
19-
"executor-thread",
20-
"executor-interrupt",
21-
"defmt",
18+
"arch-cortex-m",
19+
"executor-thread",
20+
"executor-interrupt",
21+
"defmt",
2222
] }
2323
embassy-nrf = { version = "0.7", features = [
24-
"defmt",
25-
"nrf52840",
26-
"time-driver-rtc1",
27-
"gpiote",
28-
"unstable-pac",
29-
"time",
24+
"defmt",
25+
"nrf52840",
26+
"time-driver-rtc1",
27+
"gpiote",
28+
"unstable-pac",
29+
"time",
3030
] }
3131
embassy-sync = { version = "0.7", features = ["defmt"] }
3232
embassy-time = { version = "0.5", features = [
33-
"defmt",
34-
"defmt-timestamp-uptime",
33+
"defmt",
34+
"defmt-timestamp-uptime",
3535
] }
3636
panic-probe = { version = "1.0", features = ["print-defmt"] }
3737
postcard = { version = "1.1.0" }
3838
postcard-rpc = { version = "0.11.0", features = [
39-
"embedded-io-async-0_6-server",
39+
"embedded-io-async-0_6-server",
4040
] }
4141
postcard-schema = { version = "0.2.0", features = ["derive"] }
4242
serde = { version = "1.0", default-features = false }

‎example/serial-host/Cargo.lock‎

Lines changed: 13 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎example/workbook-host/Cargo.toml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,11 @@ features = ["use-std"]
99

1010
[dependencies.postcard-rpc]
1111
version = "0.11"
12-
features = [
13-
"use-std",
14-
"raw-nusb",
15-
"cobs-serial",
16-
]
12+
features = ["use-std", "raw-nusb", "cobs-serial"]
1713

1814
[dependencies.tokio]
1915
version = "1.37.0"
20-
features = [
21-
"rt-multi-thread",
22-
"macros",
23-
"time",
24-
]
16+
features = ["rt-multi-thread", "macros", "time"]
2517

2618
[dependencies.tokio-serial]
2719
version = "5.4.4"

‎source/postcard-rpc/Cargo.toml‎

Lines changed: 53 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ readme = "../../README.md"
1414
[package.metadata.docs.rs]
1515
rustdoc-args = ["--cfg", "doc_cfg"]
1616
features = [
17-
"test-utils",
18-
"use-std",
19-
"cobs-serial",
20-
"raw-nusb",
21-
"embassy-usb-0_5-server",
22-
"embedded-io-async-0_6-server",
23-
"_docs-fix",
24-
# TODO: What to do about the webusb feature? Can we do separate target builds?
17+
"test-utils",
18+
"use-std",
19+
"cobs-serial",
20+
"raw-nusb",
21+
"embassy-usb-0_5-server",
22+
"embedded-io-async-0_6-server",
23+
"_docs-fix",
24+
# TODO: What to do about the webusb feature? Can we do separate target builds?
2525
]
2626

2727
[dependencies]
@@ -45,7 +45,7 @@ version = "5.4.4"
4545
optional = true
4646

4747
[dependencies.maitake-sync]
48-
version = "0.1.2"
48+
version = "0.2.2"
4949
optional = true
5050

5151
[dependencies.tokio]
@@ -61,6 +61,7 @@ optional = true
6161
version = "0.3.69"
6262
optional = true
6363

64+
6465
[dependencies.thiserror]
6566
version = "2"
6667
default-features = false
@@ -70,22 +71,22 @@ default-features = false
7071
version = "0.3.69"
7172
optional = true
7273
features = [
73-
"Element",
74-
"Navigator",
75-
'Usb',
76-
'UsbAlternateInterface',
77-
'UsbConfiguration',
78-
'UsbDeviceRequestOptions',
79-
'UsbDevice',
80-
'UsbDirection',
81-
'UsbEndpoint',
82-
'UsbInTransferResult',
83-
'UsbControlTransferParameters',
84-
'UsbOutTransferResult',
85-
'UsbInterface',
86-
'UsbRecipient',
87-
'UsbRequestType',
88-
"UsbTransferStatus",
74+
"Element",
75+
"Navigator",
76+
'Usb',
77+
'UsbAlternateInterface',
78+
'UsbConfiguration',
79+
'UsbDeviceRequestOptions',
80+
'UsbDevice',
81+
'UsbDirection',
82+
'UsbEndpoint',
83+
'UsbInTransferResult',
84+
'UsbControlTransferParameters',
85+
'UsbOutTransferResult',
86+
'UsbInterface',
87+
'UsbRecipient',
88+
'UsbRequestType',
89+
"UsbTransferStatus",
8990
]
9091

9192
[dependencies.gloo]
@@ -168,14 +169,14 @@ features = ["std"]
168169
default = []
169170
test-utils = ["use-std", "postcard-schema/use-std"]
170171
use-std = [
171-
"dep:maitake-sync",
172-
"dep:tokio",
173-
"postcard/use-std",
174-
"postcard-schema/use-std",
175-
"thiserror/std",
176-
"dep:tracing",
177-
"dep:trait-variant",
178-
"dep:ssmarshal",
172+
"dep:maitake-sync",
173+
"dep:tokio",
174+
"postcard/use-std",
175+
"postcard-schema/use-std",
176+
"thiserror/std",
177+
"dep:tracing",
178+
"dep:trait-variant",
179+
"dep:ssmarshal",
179180
]
180181

181182
# Cobs Serial support.
@@ -203,31 +204,31 @@ raw-nusb = ["dep:nusb", "use-std"]
203204
# rustflags = "--cfg=web_sys_unstable_apis"
204205
# ```
205206
webusb = [
206-
"dep:gloo",
207-
"dep:web-sys",
208-
"dep:serde_json",
209-
"dep:wasm-bindgen",
210-
"dep:wasm-bindgen-futures",
211-
"dep:js-sys",
212-
"use-std",
207+
"dep:gloo",
208+
"dep:web-sys",
209+
"dep:serde_json",
210+
"dep:wasm-bindgen",
211+
"dep:wasm-bindgen-futures",
212+
"dep:js-sys",
213+
"use-std",
213214
]
214215

215216
embassy-usb-0_5-server = [
216-
"dep:embassy-usb-0_5",
217-
"dep:embassy-sync-0_7",
218-
"dep:static_cell",
219-
"dep:embassy-usb-driver-0_2",
220-
"dep:embassy-executor",
221-
"dep:embassy-time",
222-
"dep:embassy-futures",
217+
"dep:embassy-usb-0_5",
218+
"dep:embassy-sync-0_7",
219+
"dep:static_cell",
220+
"dep:embassy-usb-driver-0_2",
221+
"dep:embassy-executor",
222+
"dep:embassy-time",
223+
"dep:embassy-futures",
223224
]
224225

225226
embedded-io-async-0_6-server = [
226-
"dep:embassy-sync-0_7",
227-
"dep:static_cell",
228-
"dep:embassy-executor",
229-
"dep:embedded-io-async-0_6",
230-
"cobs",
227+
"dep:embassy-sync-0_7",
228+
"dep:static_cell",
229+
"dep:embassy-executor",
230+
"dep:embedded-io-async-0_6",
231+
"cobs",
231232
]
232233

233234
# NOTE: This exists because `embassy-usb` indirectly relies on ssmarshal

‎source/postcard-rpc/src/host_client/mod.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -389,8 +389,8 @@ where
389389
let mut ok_resp = std::pin::pin!(ok_resp);
390390
let mut err_resp = std::pin::pin!(err_resp);
391391
let setup_fut: Result<(), WaitError> = async {
392-
ok_resp.as_mut().enqueue().await?;
393-
err_resp.as_mut().enqueue().await?;
392+
ok_resp.as_mut().subscribe().await?;
393+
err_resp.as_mut().subscribe().await?;
394394
Ok(())
395395
}
396396
.await;

0 commit comments

Comments
 (0)