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-executor/src/arch | |
| parent | 14eae9ca06f63a69ccc29d5fd9e1dec3848a3e98 (diff) | |
| parent | 529535194d4b5d58b31fd6a7541176105e3c63f7 (diff) | |
Merge remote-tracking branch 'origin/master' into nrf-pdm
Diffstat (limited to 'embassy-executor/src/arch')
| -rw-r--r-- | embassy-executor/src/arch/cortex_m.rs | 2 | ||||
| -rw-r--r-- | embassy-executor/src/arch/riscv32.rs | 2 | ||||
| -rw-r--r-- | embassy-executor/src/arch/std.rs | 2 | ||||
| -rw-r--r-- | embassy-executor/src/arch/wasm.rs | 2 | ||||
| -rw-r--r-- | embassy-executor/src/arch/xtensa.rs | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/embassy-executor/src/arch/cortex_m.rs b/embassy-executor/src/arch/cortex_m.rs index d6e758dfb..4b27a264e 100644 --- a/embassy-executor/src/arch/cortex_m.rs +++ b/embassy-executor/src/arch/cortex_m.rs | |||
| @@ -41,7 +41,7 @@ impl Executor { | |||
| 41 | /// Executor instance in a place where it'll live forever and grants you mutable | 41 | /// Executor instance in a place where it'll live forever and grants you mutable |
| 42 | /// access. There's a few ways to do this: | 42 | /// access. There's a few ways to do this: |
| 43 | /// | 43 | /// |
| 44 | /// - a [Forever](crate::util::Forever) (safe) | 44 | /// - a [StaticCell](https://docs.rs/static_cell/latest/static_cell/) (safe) |
| 45 | /// - a `static mut` (unsafe) | 45 | /// - a `static mut` (unsafe) |
| 46 | /// - a local variable in a function you know never returns (like `fn main() -> !`), upgrading its lifetime with `transmute`. (unsafe) | 46 | /// - a local variable in a function you know never returns (like `fn main() -> !`), upgrading its lifetime with `transmute`. (unsafe) |
| 47 | /// | 47 | /// |
diff --git a/embassy-executor/src/arch/riscv32.rs b/embassy-executor/src/arch/riscv32.rs index 7a7d5698c..2a4b006da 100644 --- a/embassy-executor/src/arch/riscv32.rs +++ b/embassy-executor/src/arch/riscv32.rs | |||
| @@ -43,7 +43,7 @@ impl Executor { | |||
| 43 | /// Executor instance in a place where it'll live forever and grants you mutable | 43 | /// Executor instance in a place where it'll live forever and grants you mutable |
| 44 | /// access. There's a few ways to do this: | 44 | /// access. There's a few ways to do this: |
| 45 | /// | 45 | /// |
| 46 | /// - a [Forever](crate::util::Forever) (safe) | 46 | /// - a [StaticCell](https://docs.rs/static_cell/latest/static_cell/) (safe) |
| 47 | /// - a `static mut` (unsafe) | 47 | /// - a `static mut` (unsafe) |
| 48 | /// - a local variable in a function you know never returns (like `fn main() -> !`), upgrading its lifetime with `transmute`. (unsafe) | 48 | /// - a local variable in a function you know never returns (like `fn main() -> !`), upgrading its lifetime with `transmute`. (unsafe) |
| 49 | /// | 49 | /// |
diff --git a/embassy-executor/src/arch/std.rs b/embassy-executor/src/arch/std.rs index b93ab8a79..701f0eb18 100644 --- a/embassy-executor/src/arch/std.rs +++ b/embassy-executor/src/arch/std.rs | |||
| @@ -40,7 +40,7 @@ impl Executor { | |||
| 40 | /// Executor instance in a place where it'll live forever and grants you mutable | 40 | /// Executor instance in a place where it'll live forever and grants you mutable |
| 41 | /// access. There's a few ways to do this: | 41 | /// access. There's a few ways to do this: |
| 42 | /// | 42 | /// |
| 43 | /// - a [Forever](crate::util::Forever) (safe) | 43 | /// - a [StaticCell](https://docs.rs/static_cell/latest/static_cell/) (safe) |
| 44 | /// - a `static mut` (unsafe) | 44 | /// - a `static mut` (unsafe) |
| 45 | /// - a local variable in a function you know never returns (like `fn main() -> !`), upgrading its lifetime with `transmute`. (unsafe) | 45 | /// - a local variable in a function you know never returns (like `fn main() -> !`), upgrading its lifetime with `transmute`. (unsafe) |
| 46 | /// | 46 | /// |
diff --git a/embassy-executor/src/arch/wasm.rs b/embassy-executor/src/arch/wasm.rs index 9d5aa31ed..98091cfbb 100644 --- a/embassy-executor/src/arch/wasm.rs +++ b/embassy-executor/src/arch/wasm.rs | |||
| @@ -59,7 +59,7 @@ impl Executor { | |||
| 59 | /// Executor instance in a place where it'll live forever and grants you mutable | 59 | /// Executor instance in a place where it'll live forever and grants you mutable |
| 60 | /// access. There's a few ways to do this: | 60 | /// access. There's a few ways to do this: |
| 61 | /// | 61 | /// |
| 62 | /// - a [Forever](crate::util::Forever) (safe) | 62 | /// - a [StaticCell](https://docs.rs/static_cell/latest/static_cell/) (safe) |
| 63 | /// - a `static mut` (unsafe) | 63 | /// - a `static mut` (unsafe) |
| 64 | /// - a local variable in a function you know never returns (like `fn main() -> !`), upgrading its lifetime with `transmute`. (unsafe) | 64 | /// - a local variable in a function you know never returns (like `fn main() -> !`), upgrading its lifetime with `transmute`. (unsafe) |
| 65 | pub fn start(&'static mut self, init: impl FnOnce(Spawner)) { | 65 | pub fn start(&'static mut self, init: impl FnOnce(Spawner)) { |
diff --git a/embassy-executor/src/arch/xtensa.rs b/embassy-executor/src/arch/xtensa.rs index 20bd7b8a5..f908aaa70 100644 --- a/embassy-executor/src/arch/xtensa.rs +++ b/embassy-executor/src/arch/xtensa.rs | |||
| @@ -43,7 +43,7 @@ impl Executor { | |||
| 43 | /// Executor instance in a place where it'll live forever and grants you mutable | 43 | /// Executor instance in a place where it'll live forever and grants you mutable |
| 44 | /// access. There's a few ways to do this: | 44 | /// access. There's a few ways to do this: |
| 45 | /// | 45 | /// |
| 46 | /// - a [Forever](crate::util::Forever) (safe) | 46 | /// - a [StaticCell](https://docs.rs/static_cell/latest/static_cell/) (safe) |
| 47 | /// - a `static mut` (unsafe) | 47 | /// - a `static mut` (unsafe) |
| 48 | /// - a local variable in a function you know never returns (like `fn main() -> !`), upgrading its lifetime with `transmute`. (unsafe) | 48 | /// - a local variable in a function you know never returns (like `fn main() -> !`), upgrading its lifetime with `transmute`. (unsafe) |
| 49 | /// | 49 | /// |
