diff --git a/compiler-core/src/lang/preset/blob.rs b/compiler-core/src/lang/preset/blob.rs index 42de25ee..85873040 100644 --- a/compiler-core/src/lang/preset/blob.rs +++ b/compiler-core/src/lang/preset/blob.rs @@ -3,7 +3,7 @@ use std::collections::BTreeMap; use serde_json::Value; use crate::lang::TempStr; -use crate::macros::{maybe_send, async_recursion}; +use crate::macros::{async_recursion, maybe_send}; use super::{Preset, PresetBlob}; diff --git a/compiler-core/src/lang/preset/hydrate.rs b/compiler-core/src/lang/preset/hydrate.rs index 991f25bc..a43bafa5 100644 --- a/compiler-core/src/lang/preset/hydrate.rs +++ b/compiler-core/src/lang/preset/hydrate.rs @@ -2,7 +2,7 @@ use std::collections::BTreeMap; use serde_json::{json, Value}; -use crate::macros::{maybe_send, async_recursion}; +use crate::macros::{async_recursion, maybe_send}; use super::{Preset, PresetBlob}; diff --git a/compiler-core/src/lib.rs b/compiler-core/src/lib.rs index a3f5f937..2ac8a51f 100644 --- a/compiler-core/src/lib.rs +++ b/compiler-core/src/lib.rs @@ -12,7 +12,7 @@ pub mod util; /// Re-exports of macros pub mod macros { - pub use celercmacros::maybe_send; pub use async_recursion::async_recursion; pub use async_trait::async_trait; + pub use celercmacros::maybe_send; } diff --git a/compiler-core/src/pack/resource/resource_github.rs b/compiler-core/src/pack/resource/resource_github.rs index aa4d6c25..0d33af55 100644 --- a/compiler-core/src/pack/resource/resource_github.rs +++ b/compiler-core/src/pack/resource/resource_github.rs @@ -1,9 +1,9 @@ //! GitHub resource resolver and loader impl use std::sync::Arc; -use crate::macros::{maybe_send, async_trait}; -use crate::util::Path; +use crate::macros::{async_trait, maybe_send}; use crate::pack::{PackerError, PackerResult, ValidUse}; +use crate::util::Path; use super::{ArcLoader, EmptyLoader, Resource, ResourcePath, ResourceResolver}; diff --git a/compiler-core/src/pack/resource/resource_impl.rs b/compiler-core/src/pack/resource/resource_impl.rs index 1808fcad..54e05529 100644 --- a/compiler-core/src/pack/resource/resource_impl.rs +++ b/compiler-core/src/pack/resource/resource_impl.rs @@ -2,8 +2,8 @@ use std::sync::Arc; use serde_json::Value; +use crate::macros::{async_trait, maybe_send}; use crate::pack::{PackerResult, ValidUse}; -use crate::macros::{maybe_send, async_trait}; use crate::util::Path; use super::ResourceLoader; diff --git a/compiler-core/src/pack/resource/resource_local.rs b/compiler-core/src/pack/resource/resource_local.rs index d2714460..a6b26d0b 100644 --- a/compiler-core/src/pack/resource/resource_local.rs +++ b/compiler-core/src/pack/resource/resource_local.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use crate::macros::{maybe_send, async_trait}; +use crate::macros::{async_trait, maybe_send}; use crate::pack::{PackerError, PackerResult, ValidUse}; use crate::util::Path; diff --git a/compiler-macros/src/lib.rs b/compiler-macros/src/lib.rs index 3260cdbc..cbad1374 100644 --- a/compiler-macros/src/lib.rs +++ b/compiler-macros/src/lib.rs @@ -1,11 +1,11 @@ -use quote::quote; use proc_macro2::TokenStream; +use quote::quote; /// A wrapper to add Send trait to `async_trait` and `async_recursion` based on the `no-async-send` /// feature gate /// /// # Examples -/// Instead of +/// Instead of /// ```ignore /// #[async_trait] /// pub trait XXX { @@ -19,7 +19,7 @@ use proc_macro2::TokenStream; /// ... /// } /// ``` -/// Instead of +/// Instead of /// ```ignore /// #[async_recursion] /// pub async fn foo() { @@ -34,7 +34,10 @@ use proc_macro2::TokenStream; /// } /// ``` #[proc_macro_attribute] -pub fn maybe_send(attr: proc_macro::TokenStream, input: proc_macro::TokenStream) -> proc_macro::TokenStream { +pub fn maybe_send( + attr: proc_macro::TokenStream, + input: proc_macro::TokenStream, +) -> proc_macro::TokenStream { let attr = TokenStream::from(attr); let input = TokenStream::from(input); let tokens = quote! { diff --git a/compiler-wasm/src/loader_file.rs b/compiler-wasm/src/loader_file.rs index c06e1850..b34493e4 100644 --- a/compiler-wasm/src/loader_file.rs +++ b/compiler-wasm/src/loader_file.rs @@ -3,8 +3,8 @@ use base64::engine::general_purpose; use base64::Engine; use std::cell::RefCell; -use celerc::pack::{ImageFormat, PackerError, PackerResult, ResourceLoader}; use celerc::macros::async_trait; +use celerc::pack::{ImageFormat, PackerError, PackerResult, ResourceLoader}; use celerc::yield_now; use js_sys::{Function, Uint8Array}; use wasm_bindgen::{JsCast, JsValue}; diff --git a/compiler-wasm/src/loader_url.rs b/compiler-wasm/src/loader_url.rs index da4cb479..0045a812 100644 --- a/compiler-wasm/src/loader_url.rs +++ b/compiler-wasm/src/loader_url.rs @@ -1,7 +1,7 @@ use std::cell::RefCell; -use celerc::pack::{PackerError, PackerResult, ResourceLoader}; use celerc::macros::async_trait; +use celerc::pack::{PackerError, PackerResult, ResourceLoader}; use celerc::yield_now; use js_sys::{Function, Uint8Array}; use wasm_bindgen::{JsCast, JsValue};