diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-04-20 17:06:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-20 17:06:08 +0000 |
| commit | 99a53c7ca7648a38899f8f042d2b4f4dbbeccdd6 (patch) | |
| tree | df162ac226e95185b1aecdc2433ff2ba11a5baae | |
| parent | f586c3c5a8a14e37d69d229fd6e69459a6074cc4 (diff) | |
| parent | fbcf2aabb0e5fdb1aa4f620b92c49ba57a5dce6a (diff) | |
Merge #477
477: Fix for default monotonic, `monotonics::now()` now properly works r=AfoHT a=korken89
Co-authored-by: Emil Fresk <emil.fresk@gmail.com>
| -rw-r--r-- | examples/t-schedule.rs | 2 | ||||
| -rw-r--r-- | macros/src/codegen.rs | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/examples/t-schedule.rs b/examples/t-schedule.rs index 5e38dba..d705160 100644 --- a/examples/t-schedule.rs +++ b/examples/t-schedule.rs @@ -40,7 +40,7 @@ mod app { let _: Result<(), ()> = handle.unwrap().cancel(); // Using default - let _: Result<foo::SpawnHandle, ()> = foo::spawn_at(monotonics::MyMono::now()); + let _: Result<foo::SpawnHandle, ()> = foo::spawn_at(monotonics::now()); let handle: Result<foo::SpawnHandle, ()> = foo::spawn_after(Seconds(1_u32)); let _: Result<foo::SpawnHandle, ()> = handle.unwrap().reschedule_after(Seconds(1_u32)); diff --git a/macros/src/codegen.rs b/macros/src/codegen.rs index 21db143..e0e09bb 100644 --- a/macros/src/codegen.rs +++ b/macros/src/codegen.rs @@ -119,7 +119,15 @@ pub fn app(app: &App, analysis: &Analysis, extra: &Extra) -> TokenStream2 { ); let user_imports = &app.user_imports; + let default_monotonic = if monotonic.args.default { + quote!(pub use #name::now;) + } else { + quote!() + }; + quote! { + #default_monotonic + #[doc = #doc] #[allow(non_snake_case)] pub mod #name { |