diff options
| author | Quentin Smith <[email protected]> | 2022-08-23 23:01:51 -0400 |
|---|---|---|
| committer | Quentin Smith <[email protected]> | 2022-08-23 23:01:51 -0400 |
| commit | 2900ab79e7afa0ca3e0d800f8a91c3253a333db1 (patch) | |
| tree | a5066235f8b1ac6c2520105db2e5c48630bc006d /embassy-cortex-m | |
| parent | 14eae9ca06f63a69ccc29d5fd9e1dec3848a3e98 (diff) | |
| parent | 529535194d4b5d58b31fd6a7541176105e3c63f7 (diff) | |
Merge remote-tracking branch 'origin/master' into nrf-pdm
Diffstat (limited to 'embassy-cortex-m')
| -rw-r--r-- | embassy-cortex-m/Cargo.toml | 2 | ||||
| -rw-r--r-- | embassy-cortex-m/src/executor.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/embassy-cortex-m/Cargo.toml b/embassy-cortex-m/Cargo.toml index 1f16da31b..7efced669 100644 --- a/embassy-cortex-m/Cargo.toml +++ b/embassy-cortex-m/Cargo.toml | |||
| @@ -35,7 +35,7 @@ prio-bits-8 = [] | |||
| 35 | defmt = { version = "0.3", optional = true } | 35 | defmt = { version = "0.3", optional = true } |
| 36 | log = { version = "0.4.14", optional = true } | 36 | log = { version = "0.4.14", optional = true } |
| 37 | 37 | ||
| 38 | embassy-util = { version = "0.1.0", path = "../embassy-util" } | 38 | embassy-sync = { version = "0.1.0", path = "../embassy-sync" } |
| 39 | embassy-executor = { version = "0.1.0", path = "../embassy-executor"} | 39 | embassy-executor = { version = "0.1.0", path = "../embassy-executor"} |
| 40 | embassy-macros = { version = "0.1.0", path = "../embassy-macros"} | 40 | embassy-macros = { version = "0.1.0", path = "../embassy-macros"} |
| 41 | embassy-hal-common = { version = "0.1.0", path = "../embassy-hal-common"} | 41 | embassy-hal-common = { version = "0.1.0", path = "../embassy-hal-common"} |
diff --git a/embassy-cortex-m/src/executor.rs b/embassy-cortex-m/src/executor.rs index 80c452f84..0d1745d8a 100644 --- a/embassy-cortex-m/src/executor.rs +++ b/embassy-cortex-m/src/executor.rs | |||
| @@ -71,7 +71,7 @@ impl<I: Interrupt> InterruptExecutor<I> { | |||
| 71 | /// Executor instance in a place where it'll live forever and grants you mutable | 71 | /// Executor instance in a place where it'll live forever and grants you mutable |
| 72 | /// access. There's a few ways to do this: | 72 | /// access. There's a few ways to do this: |
| 73 | /// | 73 | /// |
| 74 | /// - a [Forever](embassy_util::Forever) (safe) | 74 | /// - a [StaticCell](https://docs.rs/static_cell/latest/static_cell/) (safe) |
| 75 | /// - a `static mut` (unsafe) | 75 | /// - a `static mut` (unsafe) |
| 76 | /// - a local variable in a function you know never returns (like `fn main() -> !`), upgrading its lifetime with `transmute`. (unsafe) | 76 | /// - a local variable in a function you know never returns (like `fn main() -> !`), upgrading its lifetime with `transmute`. (unsafe) |
| 77 | pub fn start(&'static mut self) -> SendSpawner { | 77 | pub fn start(&'static mut self) -> SendSpawner { |
