frost/bdk
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a feature to enable the async interface on non-wasm32 platforms

Browse Source 
Follow-up to: #28
This commit is contained in:
Alekos Filini 2020-08-10 11:41:19 +02:00
parent f0a1e670df
commit f7f99172fe
No known key found for this signature in database
GPG Key ID: 5E8AFC3034FDFA4F
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -20,6 +20,7 @@ reqwest = { version = "0.10", optional = true, features = ["json"] }
futures = { version = "0.3", optional = true } futures = { version = "0.3", optional = true }
clap = { version = "2.33", optional = true } clap = { version = "2.33", optional = true }
base64 = { version = "^0.11", optional = true } base64 = { version = "^0.11", optional = true }
async-trait = { version = "0.1", optional = true }
# Platform-specific dependencies # Platform-specific dependencies
[target.'cfg(not(target_arch = "wasm32"))'.dependencies] [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
@ -37,6 +38,7 @@ electrum = ["electrum-client"]
esplora = ["reqwest", "futures"] esplora = ["reqwest", "futures"]
key-value-db = ["sled"] key-value-db = ["sled"]
cli-utils = ["clap", "base64"] cli-utils = ["clap", "base64"]
async-interface = ["async-trait"]
[dev-dependencies] [dev-dependencies]
lazy_static = "1.4" lazy_static = "1.4"

22
macros/src/lib.rs
View File

@ -8,7 +8,7 @@ use syn::{parse, ImplItemMethod, ItemImpl, ItemTrait, Token};
fn add_async_trait(mut parsed: ItemTrait) -> TokenStream { fn add_async_trait(mut parsed: ItemTrait) -> TokenStream {
let output = quote! { let output = quote! {
#[cfg(not(target_arch = "wasm32"))] #[cfg(all(not(target_arch = "wasm32"), not(feature = "async-interface")))]
#parsed #parsed
}; };
@ -21,7 +21,7 @@ fn add_async_trait(mut parsed: ItemTrait) -> TokenStream {
let output = quote! { let output = quote! {
#output #output
#[cfg(target_arch = "wasm32")] #[cfg(any(target_arch = "wasm32", feature = "async-interface"))]
#[async_trait(?Send)] #[async_trait(?Send)]
#parsed #parsed
}; };
@ -31,7 +31,7 @@ fn add_async_trait(mut parsed: ItemTrait) -> TokenStream {
fn add_async_method(mut parsed: ImplItemMethod) -> TokenStream { fn add_async_method(mut parsed: ImplItemMethod) -> TokenStream {
let output = quote! { let output = quote! {
#[cfg(not(target_arch = "wasm32"))] #[cfg(all(not(target_arch = "wasm32"), not(feature = "async-interface")))]
#parsed #parsed
}; };
@ -40,7 +40,7 @@ fn add_async_method(mut parsed: ImplItemMethod) -> TokenStream {
let output = quote! { let output = quote! {
#output #output
#[cfg(target_arch = "wasm32")] #[cfg(any(target_arch = "wasm32", feature = "async-interface"))]
#parsed #parsed
}; };
@ -49,7 +49,7 @@ fn add_async_method(mut parsed: ImplItemMethod) -> TokenStream {
fn add_async_impl_trait(mut parsed: ItemImpl) -> TokenStream { fn add_async_impl_trait(mut parsed: ItemImpl) -> TokenStream {
let output = quote! { let output = quote! {
#[cfg(not(target_arch = "wasm32"))] #[cfg(all(not(target_arch = "wasm32"), not(feature = "async-interface")))]
#parsed #parsed
}; };
@ -62,7 +62,7 @@ fn add_async_impl_trait(mut parsed: ItemImpl) -> TokenStream {
let output = quote! { let output = quote! {
#output #output
#[cfg(target_arch = "wasm32")] #[cfg(any(target_arch = "wasm32", feature = "async-interface"))]
#[async_trait(?Send)] #[async_trait(?Send)]
#parsed #parsed
}; };
@ -95,12 +95,12 @@ pub fn maybe_await(expr: TokenStream) -> TokenStream {
let expr: proc_macro2::TokenStream = expr.into(); let expr: proc_macro2::TokenStream = expr.into();
let quoted = quote! { let quoted = quote! {
{ {
#[cfg(not(target_arch = "wasm32"))] #[cfg(all(not(target_arch = "wasm32"), not(feature = "async-interface")))]
{ {
#expr #expr
} }
#[cfg(target_arch = "wasm32")] #[cfg(any(target_arch = "wasm32", feature = "async-interface"))]
{ {
#expr.await #expr.await
} }
@ -110,7 +110,7 @@ pub fn maybe_await(expr: TokenStream) -> TokenStream {
quoted.into() quoted.into()
} }
/// Awaits if target_arch is "wasm32", uses `futures::executor::block_on()` otherwise /// Awaits if target_arch is "wasm32", uses `tokio::Runtime::block_on()` otherwise
/// ///
/// Requires the `tokio` crate as a dependecy with `rt-core` or `rt-threaded` to build on non-wasm32 platforms. /// Requires the `tokio` crate as a dependecy with `rt-core` or `rt-threaded` to build on non-wasm32 platforms.
#[proc_macro] #[proc_macro]
@ -118,12 +118,12 @@ pub fn await_or_block(expr: TokenStream) -> TokenStream {
let expr: proc_macro2::TokenStream = expr.into(); let expr: proc_macro2::TokenStream = expr.into();
let quoted = quote! { let quoted = quote! {
{ {
#[cfg(not(target_arch = "wasm32"))] #[cfg(all(not(target_arch = "wasm32"), not(feature = "async-interface")))]
{ {
tokio::runtime::Runtime::new().unwrap().block_on(#expr) tokio::runtime::Runtime::new().unwrap().block_on(#expr)
} }
#[cfg(target_arch = "wasm32")] #[cfg(any(target_arch = "wasm32", feature = "async-interface"))]
{ {
#expr.await #expr.await
} }

2
src/lib.rs
View File

@ -5,7 +5,7 @@ extern crate serde;
#[macro_use] #[macro_use]
extern crate serde_json; extern crate serde_json;
#[cfg(target_arch = "wasm32")] #[cfg(any(target_arch = "wasm32", feature = "async-interface"))]
#[macro_use] #[macro_use]
extern crate async_trait; extern crate async_trait;
#[macro_use] #[macro_use]