diff options
| author | Felipe Balbi <[email protected]> | 2025-11-17 16:27:39 -0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-11-17 16:27:39 -0800 |
| commit | bf3ae8e4d69ef2e2ecfdf0b48734d9c91637eb16 (patch) | |
| tree | 60627819ec1d197a51b083b2a9db28b06336badc | |
| parent | 011c3b2de9361496faa0eea75ae19a77f2698f88 (diff) | |
Let HAL build in isolation (#21)
* Revert "chore(deps): bump embedded-io-async from 0.6.1 to 0.7.0 (#17)"
This reverts commit 011c3b2de9361496faa0eea75ae19a77f2698f88.
* Let HAL build in isolation
while at that, also remove bogus dependency on embassy-executor.
Signed-off-by: Felipe Balbi <[email protected]>
* Certify syn 2.0.110
Signed-off-by: Felipe Balbi <[email protected]>
---------
Signed-off-by: Felipe Balbi <[email protected]>
| -rw-r--r-- | .cargo/config.toml | 2 | ||||
| -rw-r--r-- | Cargo.lock | 112 | ||||
| -rw-r--r-- | Cargo.toml | 16 | ||||
| -rw-r--r-- | examples/Cargo.lock | 1 | ||||
| -rw-r--r-- | supply-chain/audits.toml | 5 | ||||
| -rw-r--r-- | supply-chain/config.toml | 4 |
6 files changed, 19 insertions, 121 deletions
diff --git a/.cargo/config.toml b/.cargo/config.toml new file mode 100644 index 000000000..55dd5ea5f --- /dev/null +++ b/.cargo/config.toml | |||
| @@ -0,0 +1,2 @@ | |||
| 1 | [build] | ||
| 2 | target = "thumbv8m.main-none-eabihf" # Cortex-M33 | ||
diff --git a/Cargo.lock b/Cargo.lock index adf69dd3d..0fb5bfb12 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
| @@ -81,41 +81,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
| 81 | checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b" | 81 | checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b" |
| 82 | 82 | ||
| 83 | [[package]] | 83 | [[package]] |
| 84 | name = "darling" | ||
| 85 | version = "0.20.11" | ||
| 86 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 87 | checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" | ||
| 88 | dependencies = [ | ||
| 89 | "darling_core", | ||
| 90 | "darling_macro", | ||
| 91 | ] | ||
| 92 | |||
| 93 | [[package]] | ||
| 94 | name = "darling_core" | ||
| 95 | version = "0.20.11" | ||
| 96 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 97 | checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" | ||
| 98 | dependencies = [ | ||
| 99 | "fnv", | ||
| 100 | "ident_case", | ||
| 101 | "proc-macro2", | ||
| 102 | "quote", | ||
| 103 | "strsim", | ||
| 104 | "syn", | ||
| 105 | ] | ||
| 106 | |||
| 107 | [[package]] | ||
| 108 | name = "darling_macro" | ||
| 109 | version = "0.20.11" | ||
| 110 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 111 | checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" | ||
| 112 | dependencies = [ | ||
| 113 | "darling_core", | ||
| 114 | "quote", | ||
| 115 | "syn", | ||
| 116 | ] | ||
| 117 | |||
| 118 | [[package]] | ||
| 119 | name = "defmt" | 84 | name = "defmt" |
| 120 | version = "1.0.1" | 85 | version = "1.0.1" |
| 121 | source = "registry+https://github.com/rust-lang/crates.io-index" | 86 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| @@ -174,37 +139,6 @@ dependencies = [ | |||
| 174 | ] | 139 | ] |
| 175 | 140 | ||
| 176 | [[package]] | 141 | [[package]] |
| 177 | name = "embassy-executor" | ||
| 178 | version = "0.9.1" | ||
| 179 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 180 | checksum = "06070468370195e0e86f241c8e5004356d696590a678d47d6676795b2e439c6b" | ||
| 181 | dependencies = [ | ||
| 182 | "cortex-m", | ||
| 183 | "critical-section", | ||
| 184 | "document-features", | ||
| 185 | "embassy-executor-macros", | ||
| 186 | "embassy-executor-timer-queue", | ||
| 187 | ] | ||
| 188 | |||
| 189 | [[package]] | ||
| 190 | name = "embassy-executor-macros" | ||
| 191 | version = "0.7.0" | ||
| 192 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 193 | checksum = "dfdddc3a04226828316bf31393b6903ee162238576b1584ee2669af215d55472" | ||
| 194 | dependencies = [ | ||
| 195 | "darling", | ||
| 196 | "proc-macro2", | ||
| 197 | "quote", | ||
| 198 | "syn", | ||
| 199 | ] | ||
| 200 | |||
| 201 | [[package]] | ||
| 202 | name = "embassy-executor-timer-queue" | ||
| 203 | version = "0.1.0" | ||
| 204 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 205 | checksum = "2fc328bf943af66b80b98755db9106bf7e7471b0cf47dc8559cd9a6be504cc9c" | ||
| 206 | |||
| 207 | [[package]] | ||
| 208 | name = "embassy-futures" | 142 | name = "embassy-futures" |
| 209 | version = "0.1.2" | 143 | version = "0.1.2" |
| 210 | source = "registry+https://github.com/rust-lang/crates.io-index" | 144 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| @@ -230,7 +164,6 @@ dependencies = [ | |||
| 230 | "critical-section", | 164 | "critical-section", |
| 231 | "defmt", | 165 | "defmt", |
| 232 | "embassy-embedded-hal", | 166 | "embassy-embedded-hal", |
| 233 | "embassy-executor", | ||
| 234 | "embassy-hal-internal", | 167 | "embassy-hal-internal", |
| 235 | "embassy-sync", | 168 | "embassy-sync", |
| 236 | "embassy-time", | 169 | "embassy-time", |
| @@ -239,8 +172,8 @@ dependencies = [ | |||
| 239 | "embedded-hal 1.0.0", | 172 | "embedded-hal 1.0.0", |
| 240 | "embedded-hal-async", | 173 | "embedded-hal-async", |
| 241 | "embedded-hal-nb", | 174 | "embedded-hal-nb", |
| 242 | "embedded-io 0.6.1", | 175 | "embedded-io", |
| 243 | "embedded-io-async 0.7.0", | 176 | "embedded-io-async", |
| 244 | "heapless", | 177 | "heapless", |
| 245 | "mcxa-pac", | 178 | "mcxa-pac", |
| 246 | "nb 1.1.0", | 179 | "nb 1.1.0", |
| @@ -255,7 +188,7 @@ checksum = "73974a3edbd0bd286759b3d483540f0ebef705919a5f56f4fc7709066f71689b" | |||
| 255 | dependencies = [ | 188 | dependencies = [ |
| 256 | "cfg-if", | 189 | "cfg-if", |
| 257 | "critical-section", | 190 | "critical-section", |
| 258 | "embedded-io-async 0.6.1", | 191 | "embedded-io-async", |
| 259 | "futures-core", | 192 | "futures-core", |
| 260 | "futures-sink", | 193 | "futures-sink", |
| 261 | "heapless", | 194 | "heapless", |
| @@ -328,27 +261,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
| 328 | checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" | 261 | checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" |
| 329 | 262 | ||
| 330 | [[package]] | 263 | [[package]] |
| 331 | name = "embedded-io" | ||
| 332 | version = "0.7.1" | ||
| 333 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 334 | checksum = "9eb1aa714776b75c7e67e1da744b81a129b3ff919c8712b5e1b32252c1f07cc7" | ||
| 335 | |||
| 336 | [[package]] | ||
| 337 | name = "embedded-io-async" | 264 | name = "embedded-io-async" |
| 338 | version = "0.6.1" | 265 | version = "0.6.1" |
| 339 | source = "registry+https://github.com/rust-lang/crates.io-index" | 266 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 340 | checksum = "3ff09972d4073aa8c299395be75161d582e7629cd663171d62af73c8d50dba3f" | 267 | checksum = "3ff09972d4073aa8c299395be75161d582e7629cd663171d62af73c8d50dba3f" |
| 341 | dependencies = [ | 268 | dependencies = [ |
| 342 | "embedded-io 0.6.1", | 269 | "embedded-io", |
| 343 | ] | ||
| 344 | |||
| 345 | [[package]] | ||
| 346 | name = "embedded-io-async" | ||
| 347 | version = "0.7.0" | ||
| 348 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 349 | checksum = "2564b9f813c544241430e147d8bc454815ef9ac998878d30cc3055449f7fd4c0" | ||
| 350 | dependencies = [ | ||
| 351 | "embedded-io 0.7.1", | ||
| 352 | ] | 270 | ] |
| 353 | 271 | ||
| 354 | [[package]] | 272 | [[package]] |
| @@ -367,12 +285,6 @@ dependencies = [ | |||
| 367 | ] | 285 | ] |
| 368 | 286 | ||
| 369 | [[package]] | 287 | [[package]] |
| 370 | name = "fnv" | ||
| 371 | version = "1.0.7" | ||
| 372 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 373 | checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" | ||
| 374 | |||
| 375 | [[package]] | ||
| 376 | name = "futures-core" | 288 | name = "futures-core" |
| 377 | version = "0.3.31" | 289 | version = "0.3.31" |
| 378 | source = "registry+https://github.com/rust-lang/crates.io-index" | 290 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| @@ -404,12 +316,6 @@ dependencies = [ | |||
| 404 | ] | 316 | ] |
| 405 | 317 | ||
| 406 | [[package]] | 318 | [[package]] |
| 407 | name = "ident_case" | ||
| 408 | version = "1.0.1" | ||
| 409 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 410 | checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" | ||
| 411 | |||
| 412 | [[package]] | ||
| 413 | name = "litrs" | 319 | name = "litrs" |
| 414 | version = "1.0.0" | 320 | version = "1.0.0" |
| 415 | source = "registry+https://github.com/rust-lang/crates.io-index" | 321 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| @@ -526,16 +432,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
| 526 | checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" | 432 | checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" |
| 527 | 433 | ||
| 528 | [[package]] | 434 | [[package]] |
| 529 | name = "strsim" | ||
| 530 | version = "0.11.1" | ||
| 531 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 532 | checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" | ||
| 533 | |||
| 534 | [[package]] | ||
| 535 | name = "syn" | 435 | name = "syn" |
| 536 | version = "2.0.109" | 436 | version = "2.0.110" |
| 537 | source = "registry+https://github.com/rust-lang/crates.io-index" | 437 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 538 | checksum = "2f17c7e013e88258aa9543dcbe81aca68a667a9ac37cd69c9fbc07858bfe0e2f" | 438 | checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea" |
| 539 | dependencies = [ | 439 | dependencies = [ |
| 540 | "proc-macro2", | 440 | "proc-macro2", |
| 541 | "quote", | 441 | "quote", |
diff --git a/Cargo.toml b/Cargo.toml index db2bc6934..841ce1903 100644 --- a/Cargo.toml +++ b/Cargo.toml | |||
| @@ -13,24 +13,20 @@ cortex-m-rt = { version = "0.7", features = ["device"] } | |||
| 13 | critical-section = "1.2.0" | 13 | critical-section = "1.2.0" |
| 14 | defmt = { version = "1.0", optional = true } | 14 | defmt = { version = "1.0", optional = true } |
| 15 | embassy-embedded-hal = "0.5.0" | 15 | embassy-embedded-hal = "0.5.0" |
| 16 | embassy-executor = { version = "0.9.0", features = ["arch-cortex-m", "executor-interrupt", "executor-thread"], default-features = false } | ||
| 17 | embassy-hal-internal = { version = "0.3.0", features = ["cortex-m", "prio-bits-3"] } | 16 | embassy-hal-internal = { version = "0.3.0", features = ["cortex-m", "prio-bits-3"] } |
| 18 | embassy-sync = "0.7.2" | 17 | embassy-sync = "0.7.2" |
| 19 | embassy-time = "0.5.0" | 18 | embassy-time = "0.5.0" |
| 20 | embassy-time-driver = "0.2.1" | 19 | embassy-time-driver = "0.2.1" |
| 21 | embedded-io = "0.6" | ||
| 22 | heapless = "0.8" | ||
| 23 | mcxa-pac = { git = "https://github.com/OpenDevicePartnership/mcxa-pac", features = ["rt"], rev = "3ab4c868f75a9240bb8fdce24982d34f2273aabf", version = "0.1.0" } | ||
| 24 | paste = "1.0.15" | ||
| 25 | |||
| 26 | embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = [ | ||
| 27 | "unproven", | ||
| 28 | ] } | ||
| 29 | embedded-hal = { package = "embedded-hal", version = "1.0" } | 20 | embedded-hal = { package = "embedded-hal", version = "1.0" } |
| 21 | embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = ["unproven"] } | ||
| 30 | embedded-hal-async = { version = "1.0" } | 22 | embedded-hal-async = { version = "1.0" } |
| 31 | embedded-hal-nb = { version = "1.0" } | 23 | embedded-hal-nb = { version = "1.0" } |
| 32 | embedded-io-async = { version = "0.7.0" } | 24 | embedded-io = "0.6" |
| 25 | embedded-io-async = { version = "0.6.1" } | ||
| 26 | heapless = "0.8" | ||
| 27 | mcxa-pac = { git = "https://github.com/OpenDevicePartnership/mcxa-pac", features = ["rt"], rev = "3ab4c868f75a9240bb8fdce24982d34f2273aabf", version = "0.1.0" } | ||
| 33 | nb = "1.1.0" | 28 | nb = "1.1.0" |
| 29 | paste = "1.0.15" | ||
| 34 | 30 | ||
| 35 | [features] | 31 | [features] |
| 36 | default = [] | 32 | default = [] |
diff --git a/examples/Cargo.lock b/examples/Cargo.lock index b774aff97..b2ac9a051 100644 --- a/examples/Cargo.lock +++ b/examples/Cargo.lock | |||
| @@ -240,7 +240,6 @@ dependencies = [ | |||
| 240 | "critical-section", | 240 | "critical-section", |
| 241 | "defmt", | 241 | "defmt", |
| 242 | "embassy-embedded-hal", | 242 | "embassy-embedded-hal", |
| 243 | "embassy-executor", | ||
| 244 | "embassy-hal-internal", | 243 | "embassy-hal-internal", |
| 245 | "embassy-sync", | 244 | "embassy-sync", |
| 246 | "embassy-time", | 245 | "embassy-time", |
diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml index 60ebedf9b..2aba6b961 100644 --- a/supply-chain/audits.toml +++ b/supply-chain/audits.toml | |||
| @@ -110,6 +110,11 @@ delta = "2.1.0 -> 2.1.1" | |||
| 110 | [[audits.syn]] | 110 | [[audits.syn]] |
| 111 | who = "Felipe Balbi <[email protected]>" | 111 | who = "Felipe Balbi <[email protected]>" |
| 112 | criteria = "safe-to-deploy" | 112 | criteria = "safe-to-deploy" |
| 113 | version = "2.0.110" | ||
| 114 | |||
| 115 | [[audits.syn]] | ||
| 116 | who = "Felipe Balbi <[email protected]>" | ||
| 117 | criteria = "safe-to-deploy" | ||
| 113 | delta = "2.0.100 -> 2.0.109" | 118 | delta = "2.0.100 -> 2.0.109" |
| 114 | 119 | ||
| 115 | [[audits.thiserror]] | 120 | [[audits.thiserror]] |
diff --git a/supply-chain/config.toml b/supply-chain/config.toml index 5927b0b61..36a513ee2 100644 --- a/supply-chain/config.toml +++ b/supply-chain/config.toml | |||
| @@ -181,10 +181,6 @@ criteria = "safe-to-deploy" | |||
| 181 | version = "2.1.0" | 181 | version = "2.1.0" |
| 182 | criteria = "safe-to-run" | 182 | criteria = "safe-to-run" |
| 183 | 183 | ||
| 184 | [[exemptions.syn]] | ||
| 185 | version = "2.0.100" | ||
| 186 | criteria = "safe-to-deploy" | ||
| 187 | |||
| 188 | [[exemptions.typenum]] | 184 | [[exemptions.typenum]] |
| 189 | version = "1.18.0" | 185 | version = "1.18.0" |
| 190 | criteria = "safe-to-deploy" | 186 | criteria = "safe-to-deploy" |
