Skip to content

Commit

Permalink
run fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
Pistonight committed Oct 10, 2023
1 parent 21101d4 commit dd472f7
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 13 deletions.
2 changes: 1 addition & 1 deletion compiler-core/src/lang/preset/blob.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};

Expand Down
2 changes: 1 addition & 1 deletion compiler-core/src/lang/preset/hydrate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};

Expand Down
2 changes: 1 addition & 1 deletion compiler-core/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
4 changes: 2 additions & 2 deletions compiler-core/src/pack/resource/resource_github.rs
Original file line number Diff line number Diff line change
@@ -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};

Expand Down
2 changes: 1 addition & 1 deletion compiler-core/src/pack/resource/resource_impl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion compiler-core/src/pack/resource/resource_local.rs
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
11 changes: 7 additions & 4 deletions compiler-macros/src/lib.rs
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -19,7 +19,7 @@ use proc_macro2::TokenStream;
/// ...
/// }
/// ```
/// Instead of
/// Instead of
/// ```ignore
/// #[async_recursion]
/// pub async fn foo() {
Expand All @@ -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! {
Expand Down
2 changes: 1 addition & 1 deletion compiler-wasm/src/loader_file.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down
2 changes: 1 addition & 1 deletion compiler-wasm/src/loader_url.rs
Original file line number Diff line number Diff line change
@@ -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};
Expand Down

0 comments on commit dd472f7

Please sign in to comment.