diff options
| author | Ulf Lilleengen <[email protected]> | 2021-09-02 14:45:20 +0200 |
|---|---|---|
| committer | Ulf Lilleengen <[email protected]> | 2021-09-02 14:45:54 +0200 |
| commit | 5f04d6e6c51fd5f13c04aa122ba9811d97d8a116 (patch) | |
| tree | da8a7d110cdec6f451f83863450911bc59a0f73f /embassy-macros | |
| parent | a3beb1ca3da5c6760f2c752f660fcee545793f12 (diff) | |
Fix embassy::main macros for std target
Diffstat (limited to 'embassy-macros')
| -rw-r--r-- | embassy-macros/src/lib.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/embassy-macros/src/lib.rs b/embassy-macros/src/lib.rs index 54cf6fb8a..ab327aced 100644 --- a/embassy-macros/src/lib.rs +++ b/embassy-macros/src/lib.rs | |||
| @@ -386,7 +386,6 @@ pub fn main(args: TokenStream, item: TokenStream) -> TokenStream { | |||
| 386 | }; | 386 | }; |
| 387 | 387 | ||
| 388 | let embassy_path = macro_args.embassy_prefix.append("embassy"); | 388 | let embassy_path = macro_args.embassy_prefix.append("embassy"); |
| 389 | let embassy_std_path = macro_args.embassy_prefix.append("embassy_std"); | ||
| 390 | 389 | ||
| 391 | let mut fail = false; | 390 | let mut fail = false; |
| 392 | if task_fn.sig.asyncness.is_none() { | 391 | if task_fn.sig.asyncness.is_none() { |
| @@ -427,7 +426,6 @@ pub fn main(args: TokenStream, item: TokenStream) -> TokenStream { | |||
| 427 | let task_fn_body = task_fn.block.clone(); | 426 | let task_fn_body = task_fn.block.clone(); |
| 428 | 427 | ||
| 429 | let embassy_path = embassy_path.path(); | 428 | let embassy_path = embassy_path.path(); |
| 430 | let embassy_std_path = embassy_std_path.path(); | ||
| 431 | let embassy_prefix_lit = macro_args.embassy_prefix.literal(); | 429 | let embassy_prefix_lit = macro_args.embassy_prefix.literal(); |
| 432 | 430 | ||
| 433 | let result = quote! { | 431 | let result = quote! { |
| @@ -441,7 +439,7 @@ pub fn main(args: TokenStream, item: TokenStream) -> TokenStream { | |||
| 441 | ::core::mem::transmute(t) | 439 | ::core::mem::transmute(t) |
| 442 | } | 440 | } |
| 443 | 441 | ||
| 444 | let mut executor = #embassy_std_path::Executor::new(); | 442 | let mut executor = #embassy_path::executor::Executor::new(); |
| 445 | let executor = unsafe { make_static(&mut executor) }; | 443 | let executor = unsafe { make_static(&mut executor) }; |
| 446 | 444 | ||
| 447 | executor.run(|spawner| { | 445 | executor.run(|spawner| { |
